diff options
author | xinhe <xinhe@google.com> | 2015-10-16 11:08:15 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-10-27 15:22:36 -0700 |
commit | 9cc8cb00450091b8597486493c76ca77bf8890d5 (patch) | |
tree | cd7431778028bb857b0e21a224682e2d4a98ae28 | |
parent | b3ee07a2b409607b1c50be5b190e50ca944a9c8d (diff) | |
download | wifi-marshmallow-cts-release.tar.gz |
Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-6.0.0_r7marshmallow-releasemarshmallow-cts-release
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); } |