diff options
| author | xin He <xinhe@google.com> | 2015-10-16 19:09:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 19:09:04 +0000 |
| commit | c9bea298d4b6d4c9920914d3dc8df23e3c595700 (patch) | |
| tree | e2def0a743cdd2f96e688391514347a9b78eefa5 | |
| parent | 9d86423893492156db7fbc1b4f94ef0517ca9220 (diff) | |
| parent | f2e7f4fa1ac1481cdbc7bf3296321ac0fa159cc6 (diff) | |
| download | android_frameworks_opt_net_wifi-c9bea298d4b6d4c9920914d3dc8df23e3c595700.tar.gz android_frameworks_opt_net_wifi-c9bea298d4b6d4c9920914d3dc8df23e3c595700.tar.bz2 android_frameworks_opt_net_wifi-c9bea298d4b6d4c9920914d3dc8df23e3c595700.zip | |
am f2e7f4fa: Merge "Security Vulnerability in android::onPnoNetworkFound" into mnc-dr-dev
* commit 'f2e7f4fa1ac1481cdbc7bf3296321ac0fa159cc6':
Security Vulnerability in android::onPnoNetworkFound
| -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 3484a5a95..a7c63d4f0 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 b02556614..1a790ef36 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -1931,7 +1931,7 @@ public final class WifiServiceImpl extends IWifiManager.Stub { return mWifiStateMachine.getEnableAutoJoinWhenAssociated(); } public void setHalBasedAutojoinOffload(int enabled) { - enforceChangePermission(); + enforceConnectivityInternalPermission(); mWifiStateMachine.setHalBasedAutojoinOffload(enabled); } |