diff options
| author | xinhe <xinhe@google.com> | 2015-10-16 11:08:15 -0700 |
|---|---|---|
| committer | xinhe <xinhe@google.com> | 2015-10-19 11:42:55 -0700 |
| commit | a15a2ee69156fa6fff09c0dd9b8182cb8fafde1c (patch) | |
| tree | cd7431778028bb857b0e21a224682e2d4a98ae28 | |
| parent | 4436f1f214d4831e4b3615b3f4fc96abf3ffa20a (diff) | |
Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]
Ask for system permission to enable ePNO
b/24872703
Change-Id: I8a7aafdb3f4074089777ad6b1402d4bf4954e81a
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index 652899e80..02ddd0005 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -392,8 +392,8 @@ public class WifiConfigStore extends IpConfigStore { public static final int maxNumScanCacheEntries = 128; - public final AtomicBoolean enableHalBasedPno = new AtomicBoolean(true); - public final AtomicBoolean enableSsidWhitelist = new AtomicBoolean(true); + public final AtomicBoolean enableHalBasedPno = new AtomicBoolean(false); + public final AtomicBoolean enableSsidWhitelist = new AtomicBoolean(false); public final AtomicBoolean enableAutoJoinWhenAssociated = new AtomicBoolean(true); public final AtomicBoolean enableFullBandScanWhenAssociated = new AtomicBoolean(true); public final AtomicBoolean enableChipWakeUpWhenAssociated = new AtomicBoolean(true); diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 46058ad2c..ca85fbc50 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -1913,7 +1913,7 @@ public final class WifiServiceImpl extends IWifiManager.Stub { return mWifiStateMachine.getEnableAutoJoinWhenAssociated(); } public void setHalBasedAutojoinOffload(int enabled) { - enforceChangePermission(); + enforceConnectivityInternalPermission(); mWifiStateMachine.setHalBasedAutojoinOffload(enabled); } |