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);
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);
     }