From dfe291b72bea057a33f92ca156bb6ed699d18b86 Mon Sep 17 00:00:00 2001 From: Peter Visontay Date: Wed, 18 Oct 2017 18:40:23 +0100 Subject: [PATCH] Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes). Test: Manually tested that the op is noted. Ran unit tests. Bug: 63907873 Change-Id: I1afde628d98fa3a042e7ce818ac266d5902fc5a9 --- wifi/java/android/net/wifi/IWifiManager.aidl | 36 +++++++++++----------- wifi/java/android/net/wifi/WifiManager.java | 32 +++++++++---------- .../src/android/net/wifi/WifiManagerTest.java | 10 +++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 551e4df1c816..26a2bdde40fc 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -66,11 +66,11 @@ interface IWifiManager List getMatchingOsuProviders(in ScanResult scanResult); - int addOrUpdateNetwork(in WifiConfiguration config); + int addOrUpdateNetwork(in WifiConfiguration config, String packageName); - boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config); + boolean addOrUpdatePasspointConfiguration(in PasspointConfiguration config, String packageName); - boolean removePasspointConfiguration(in String fqdn); + boolean removePasspointConfiguration(in String fqdn, String packageName); List getPasspointConfigurations(); @@ -80,21 +80,21 @@ interface IWifiManager void deauthenticateNetwork(long holdoff, boolean ess); - boolean removeNetwork(int netId); + boolean removeNetwork(int netId, String packageName); - boolean enableNetwork(int netId, boolean disableOthers); + boolean enableNetwork(int netId, boolean disableOthers, String packageName); - boolean disableNetwork(int netId); + boolean disableNetwork(int netId, String packageName); - void startScan(in ScanSettings requested, in WorkSource ws, in String packageName); + void startScan(in ScanSettings requested, in WorkSource ws, String packageName); List getScanResults(String callingPackage); - void disconnect(); + void disconnect(String packageName); - void reconnect(); + void reconnect(String packageName); - void reassociate(); + void reassociate(String packageName); WifiInfo getConnectionInfo(String callingPackage); @@ -108,7 +108,7 @@ interface IWifiManager boolean isDualBandSupported(); - boolean saveConfiguration(); + boolean saveConfiguration(String packageName); DhcpInfo getDhcpInfo(); @@ -134,9 +134,9 @@ interface IWifiManager boolean stopSoftAp(); - int startLocalOnlyHotspot(in Messenger messenger, in IBinder binder, in String packageName); + int startLocalOnlyHotspot(in Messenger messenger, in IBinder binder, String packageName); - void stopLocalOnlyHotspot(); + void stopLocalOnlyHotspot(String packageName); void startWatchLocalOnlyHotspot(in Messenger messenger, in IBinder binder); @@ -146,9 +146,9 @@ interface IWifiManager WifiConfiguration getWifiApConfiguration(); - void setWifiApConfiguration(in WifiConfiguration wifiConfig); + void setWifiApConfiguration(in WifiConfiguration wifiConfig, String packageName); - Messenger getWifiServiceMessenger(); + Messenger getWifiServiceMessenger(String packageName); void enableTdls(String remoteIPAddress, boolean enable); @@ -166,16 +166,16 @@ interface IWifiManager void setAllowScansWithTraffic(int enabled); int getAllowScansWithTraffic(); - boolean setEnableAutoJoinWhenAssociated(boolean enabled); + boolean setEnableAutoJoinWhenAssociated(boolean enabled, String packageName); boolean getEnableAutoJoinWhenAssociated(); void enableWifiConnectivityManager(boolean enabled); WifiConnectionStatistics getConnectionStatistics(); - void disableEphemeralNetwork(String SSID); + void disableEphemeralNetwork(String SSID, String packageName); - void factoryReset(); + void factoryReset(String packageName); Network getCurrentNetwork(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index c2959d5e7ab7..95d38c8c7ab5 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1127,7 +1127,7 @@ public class WifiManager { */ private int addOrUpdateNetwork(WifiConfiguration config) { try { - return mService.addOrUpdateNetwork(config); + return mService.addOrUpdateNetwork(config, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1148,7 +1148,7 @@ public class WifiManager { */ public void addOrUpdatePasspointConfiguration(PasspointConfiguration config) { try { - if (!mService.addOrUpdatePasspointConfiguration(config)) { + if (!mService.addOrUpdatePasspointConfiguration(config, mContext.getOpPackageName())) { throw new IllegalArgumentException(); } } catch (RemoteException e) { @@ -1165,7 +1165,7 @@ public class WifiManager { */ public void removePasspointConfiguration(String fqdn) { try { - if (!mService.removePasspointConfiguration(fqdn)) { + if (!mService.removePasspointConfiguration(fqdn, mContext.getOpPackageName())) { throw new IllegalArgumentException(); } } catch (RemoteException e) { @@ -1251,7 +1251,7 @@ public class WifiManager { */ public boolean removeNetwork(int netId) { try { - return mService.removeNetwork(netId); + return mService.removeNetwork(netId, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1297,7 +1297,7 @@ public class WifiManager { boolean success; try { - success = mService.enableNetwork(netId, attemptConnect); + success = mService.enableNetwork(netId, attemptConnect, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1323,7 +1323,7 @@ public class WifiManager { */ public boolean disableNetwork(int netId) { try { - return mService.disableNetwork(netId); + return mService.disableNetwork(netId, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1336,7 +1336,7 @@ public class WifiManager { */ public boolean disconnect() { try { - mService.disconnect(); + mService.disconnect(mContext.getOpPackageName()); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1351,7 +1351,7 @@ public class WifiManager { */ public boolean reconnect() { try { - mService.reconnect(); + mService.reconnect(mContext.getOpPackageName()); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1366,7 +1366,7 @@ public class WifiManager { */ public boolean reassociate() { try { - mService.reassociate(); + mService.reassociate(mContext.getOpPackageName()); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1739,7 +1739,7 @@ public class WifiManager { @Deprecated public boolean saveConfiguration() { try { - return mService.saveConfiguration(); + return mService.saveConfiguration(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2060,7 +2060,7 @@ public class WifiManager { } mLOHSCallbackProxy = null; try { - mService.stopLocalOnlyHotspot(); + mService.stopLocalOnlyHotspot(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2179,7 +2179,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(WifiConfiguration wifiConfig) { try { - mService.setWifiApConfiguration(wifiConfig); + mService.setWifiApConfiguration(wifiConfig, mContext.getOpPackageName()); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2951,7 +2951,7 @@ public class WifiManager { public void disableEphemeralNetwork(String SSID) { if (SSID == null) throw new IllegalArgumentException("SSID cannot be null"); try { - mService.disableEphemeralNetwork(SSID); + mService.disableEphemeralNetwork(SSID, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2990,7 +2990,7 @@ public class WifiManager { */ public Messenger getWifiServiceMessenger() { try { - return mService.getWifiServiceMessenger(); + return mService.getWifiServiceMessenger(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3519,7 +3519,7 @@ public class WifiManager { */ public void factoryReset() { try { - mService.factoryReset(); + mService.factoryReset(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3546,7 +3546,7 @@ public class WifiManager { */ public boolean setEnableAutoJoinWhenAssociated(boolean enabled) { try { - return mService.setEnableAutoJoinWhenAssociated(enabled); + return mService.setEnableAutoJoinWhenAssociated(enabled, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index ee6f12b775a8..1364224c443d 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -136,7 +136,7 @@ public class WifiManagerTest { assertEquals(mApConfig, callback.mRes.getWifiConfiguration()); callback.mRes.close(); - verify(mWifiService).stopLocalOnlyHotspot(); + verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME); } /** @@ -156,7 +156,7 @@ public class WifiManagerTest { assertEquals(mApConfig, res.getWifiConfiguration()); } - verify(mWifiService).stopLocalOnlyHotspot(); + verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME); } /** @@ -547,7 +547,7 @@ public class WifiManagerTest { anyString())).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mWifiManager.cancelLocalOnlyHotspotRequest(); - verify(mWifiService).stopLocalOnlyHotspot(); + verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME); } /** @@ -569,7 +569,7 @@ public class WifiManagerTest { anyString())).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mWifiManager.cancelLocalOnlyHotspotRequest(); - verify(mWifiService).stopLocalOnlyHotspot(); + verify(mWifiService).stopLocalOnlyHotspot(TEST_PACKAGE_NAME); mLooper.dispatchAll(); assertEquals(ERROR_NOT_SET, callback.mFailureReason); assertFalse(callback.mOnStartedCalled); @@ -593,7 +593,7 @@ public class WifiManagerTest { assertFalse(callback.mOnStoppedCalled); assertEquals(null, callback.mRes); mWifiManager.cancelLocalOnlyHotspotRequest(); - verify(mWifiService, never()).stopLocalOnlyHotspot(); + verify(mWifiService, never()).stopLocalOnlyHotspot(anyString()); } /** -- 2.11.0