From 8964a106164d84089c1ee52b62973c346115822b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 14 May 2018 12:50:45 -0700 Subject: Only allow settings app to set user choice 3rd party app connect requests should not set user choice. User choice was meant to capture explicit network selections by the user from settings app. Bug: 72635747 Test: Unit tests Change-Id: I8d15e262447c5d120c91f0f7213e57a13a088769 --- service/java/com/android/server/wifi/WifiStateMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 5e49a4c6f..1d40360f9 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1142,7 +1142,7 @@ public class WifiStateMachine extends StateMachine { || !mWifiConfigManager.updateLastConnectUid(netId, uid)) { logi("connectToUserSelectNetwork Allowing uid " + uid + " with insufficient permissions to connect=" + netId); - } else { + } else if (mWifiPermissionsUtil.checkNetworkSettingsPermission(uid)) { // Note user connect choice here, so that it will be considered in the next network // selection. mWifiConnectivityManager.setUserConnectChoice(netId); -- cgit v1.2.3