From 3a86cc60b6cd3a5eb7b4982ba98f7e71ad45915e Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Mon, 20 Mar 2017 10:02:12 -0700 Subject: hotspot2: allow Process.WIFI_UID to modify Passpoint networks Passpoint networks are generated by PasspointManager, and can be added to WifiConfigManager via either PasspointNetworkEvaluator (for auto connection) or Settings app (for manual connection). In either case, the network will need to be removed from WifiConfigManager once the connection is completed. Since the Passpoint networks are managed/owned by us, bypass the permission check for any Passpoint network modifications made by us (with UID Process.WIFI_UID). Bug: 36357280 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: manual test Change-Id: I5b1bcf3cb882a9d63a1643d8db779788c22b8036 --- service/java/com/android/server/wifi/WifiConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 48dfc2fd1..eaa6a107a 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -34,6 +34,7 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiScanner; +import android.os.Process; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; @@ -613,6 +614,14 @@ public class WifiConfigManager { * @param ignoreLockdown Ignore the configuration lockdown checks for connection attempts. */ private boolean canModifyNetwork(WifiConfiguration config, int uid, boolean ignoreLockdown) { + // Passpoint configurations are generated and managed by PasspointManager. They can be + // added by either PasspointNetworkEvaluator (for auto connection) or Settings app + // (for manual connection), and need to be removed once the connection is completed. + // Since it is "owned" by us, so always allow us to modify them. + if (config.isPasspoint() && uid == Process.WIFI_UID) { + return true; + } + final DevicePolicyManagerInternal dpmi = LocalServices.getService( DevicePolicyManagerInternal.class); -- cgit v1.2.3