diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 13 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java | 24 |
2 files changed, 17 insertions, 20 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 51ade7234..19447e36d 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -141,10 +141,6 @@ public class WifiServiceImpl extends IWifiManager.Stub { private static final boolean DBG = true; private static final boolean VDBG = false; - // Package names for Settings, QuickSettings and QuickQuickSettings - private static final String SYSUI_PACKAGE_NAME = "com.android.systemui"; - private static final String SETTINGS_PACKAGE_NAME = "com.android.settings"; - // Dumpsys argument to enable/disable disconnect on IP reachability failures. private static final String DUMP_ARG_SET_IPREACH_DISCONNECT = "set-ipreach-disconnect"; private static final String DUMP_ARG_SET_IPREACH_DISCONNECT_ENABLED = "enabled"; @@ -723,6 +719,12 @@ public class WifiServiceImpl extends IWifiManager.Stub { mWifiPermissionsUtil.enforceLocationPermission(pkgName, uid); } + private boolean checkNetworkSettingsPermission() { + int result = mContext.checkCallingOrSelfPermission( + android.Manifest.permission.NETWORK_SETTINGS); + return result == PackageManager.PERMISSION_GRANTED; + } + /** * see {@link android.net.wifi.WifiManager#setWifiEnabled(boolean)} * @param enable {@code true} to enable, {@code false} to disable. @@ -741,8 +743,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { // If SoftAp is enabled, only Settings is allowed to toggle wifi boolean apEnabled = mWifiStateMachine.syncGetWifiApState() != WifiManager.WIFI_AP_STATE_DISABLED; - boolean isFromSettings = - packageName.equals(SYSUI_PACKAGE_NAME) || packageName.equals(SETTINGS_PACKAGE_NAME); + boolean isFromSettings = checkNetworkSettingsPermission(); if (apEnabled && !isFromSettings) { mLog.trace("setWifiEnabled SoftAp not disabled: only Settings can enable wifi").flush(); return false; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java index 0c608d9ea..64100e217 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -56,6 +56,7 @@ import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.IpConfiguration; import android.net.wifi.ScanSettings; @@ -110,7 +111,6 @@ public class WifiServiceImplTest { private static final long WIFI_BACKGROUND_SCAN_INTERVAL = 10000; private static final String ANDROID_SYSTEM_PACKAGE = "android"; private static final String TEST_PACKAGE_NAME = "TestPackage"; - private static final String SETTINGS_PACKAGE_NAME = "com.android.settings"; private static final String SYSUI_PACKAGE_NAME = "com.android.systemui"; private static final int TEST_PID = 6789; private static final int TEST_PID2 = 9876; @@ -363,23 +363,16 @@ public class WifiServiceImplTest { } /** - * Verify that a call from Settings can enable wifi if we are in softap mode. + * Verify that a call from an app with the NETWORK_SETTINGS permission can enable wifi if we + * are in softap mode. */ @Test - public void testSetWifiEnabledFromSettingsWhenApEnabled() throws Exception { - when(mWifiStateMachine.syncGetWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED); - when(mSettingsStore.handleWifiToggled(eq(true))).thenReturn(true); - assertTrue(mWifiServiceImpl.setWifiEnabled(SETTINGS_PACKAGE_NAME, true)); - verify(mWifiController).sendMessage(eq(CMD_WIFI_TOGGLED)); - } - - /** - * Verify that a call from SysUI can enable wifi if we are in softap mode. - */ - @Test - public void testSetWifiEnabledFromSysUiWhenApEnabled() throws Exception { + public void testSetWifiEnabledFromNetworkSettingsHolderWhenApEnabled() throws Exception { when(mWifiStateMachine.syncGetWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED); when(mSettingsStore.handleWifiToggled(eq(true))).thenReturn(true); + when(mContext.checkCallingOrSelfPermission( + eq(android.Manifest.permission.NETWORK_SETTINGS))) + .thenReturn(PackageManager.PERMISSION_GRANTED); assertTrue(mWifiServiceImpl.setWifiEnabled(SYSUI_PACKAGE_NAME, true)); verify(mWifiController).sendMessage(eq(CMD_WIFI_TOGGLED)); } @@ -390,6 +383,9 @@ public class WifiServiceImplTest { @Test public void testSetWifiEnabledFromAppFailsWhenApEnabled() throws Exception { when(mWifiStateMachine.syncGetWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED); + when(mContext.checkCallingOrSelfPermission( + eq(android.Manifest.permission.NETWORK_SETTINGS))) + .thenReturn(PackageManager.PERMISSION_DENIED); assertFalse(mWifiServiceImpl.setWifiEnabled(TEST_PACKAGE_NAME, true)); verify(mSettingsStore, never()).handleWifiToggled(anyBoolean()); verify(mWifiController, never()).sendMessage(eq(CMD_WIFI_TOGGLED)); |