commit 9cc8cb00450091b8597486493c76ca77bf8890d5
author xinhe <xinhe@google.com> Fri Oct 16 11:08:15 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 27 15:22:36 2015 -0700
tree cd7431778028bb857b0e21a224682e2d4a98ae28
parent b3ee07a2b409607b1c50be5b190e50ca944a9c8d

Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]

   Ask for system permission to enable ePNO

b/24872703

Change-Id: I8a7aafdb3f4074089777ad6b1402d4bf4954e81a

service/java/com/android/server/wifi/WifiConfigStore.java

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 652899e..02ddd00 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -392,8 +392,8 @@
 
     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);

service/java/com/android/server/wifi/WifiServiceImpl.java

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 46058ad..ca85fbc 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1913,7 +1913,7 @@
         return mWifiStateMachine.getEnableAutoJoinWhenAssociated();
     }
     public void setHalBasedAutojoinOffload(int enabled) {
-        enforceChangePermission();
+        enforceConnectivityInternalPermission();
         mWifiStateMachine.setHalBasedAutojoinOffload(enabled);
     }