tag 86446ab5af7b25bce1c3f351950b52b88d6b3225
tagger The Android Open Source Project <initial-contribution@android.com> Thu Dec 06 18:49:41 2018 -0800
object d028902bb2d58015fba7a98a78ba46e067fa51ee

Android VTS 9.0 Release 5 (5140538)

commit d028902bb2d58015fba7a98a78ba46e067fa51ee
author Rebecca Silberstein <silberst@google.com> Thu Jun 28 16:10:29 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 30 04:27:12 2018 +0000
tree 770122f6e1bfcff8bec49d1bf247639c84bb12bc
parent 5e987ca9893f968927e722a152d90f07467cc791

WifiPermissionsUtil: remove connectivity app bypass

Remove the "connectivity app" bypass for getting scan results.

Changes in the CL:
a) Made the method checking permissions and device state more clear by
adding the location mode check up front with an explicit
SecurityException.
b) Added a bypass for apps with NETWORK_SETTINGS & NETWORK_SETUP_WIZARD
permissions.

Bug: 110264588
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified device connects to wifi after starting
Test: manually verified Settings displays scan results (regardless of
whether location is on or off)
Change-Id: I2e5fa52689ec65c2ca85a32be10c179f9b9ee91b
(cherry picked from commit a545d80998db04392dfc3566f480041ea18e2bb6)