summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRandy Pan <zpan@google.com>2016-08-22 17:24:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-22 17:24:18 +0000
commit9d60f8726575683f345cfe527e2d1afb2367c92f (patch)
treee8da01b3c8f4ab8c88fe76a82ab8bd3cedfd528a /service
parent8bc512d77b002fdd4a4a920ab8737e70f74a4f0d (diff)
parent41b85e0341099cc2da048e7400a72046336c1cce (diff)
Merge "Track if untrusted wifi network is allowed" into nyc-mr1-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 266de2a73..603c4757c 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4729,6 +4729,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
WifiStateMachine.this, mWifiScanner, mWifiConfigManager, mWifiInfo,
mWifiQualifiedNetworkSelector, mWifiInjector,
getHandler().getLooper(), hasConnectionRequests());
+ mWifiConnectivityManager.setUntrustedConnectionAllowed(mUntrustedReqCount > 0);
}
}