summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2018-05-14 12:50:45 -0700
committerRoshan Pius <rpius@google.com>2018-05-15 12:16:02 -0700
commit8964a106164d84089c1ee52b62973c346115822b (patch)
tree75497a6dd86897e52ce051f04d07b24ee0a5f196 /service
parentd0b1c6de370037885cf0da1eb202efff23c746b4 (diff)
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
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java2
1 files changed, 1 insertions, 1 deletions
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);