Merge "WifiServiceImpl: Clear calling identity before invoking Settings.put" into rvc-dev

1 files changed, 7 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index eefe6ded7..4dc45946d 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1904,8 +1904,13 @@ public class WifiServiceImpl extends BaseWifiService {
         enforceNetworkSettingsPermission();
         mLog.info("setScanAlwaysAvailable uid=%").c(Binder.getCallingUid()).flush();
         mSettingsStore.handleWifiScanAlwaysAvailableToggled(isAvailable);
-        mWifiInjector.getWifiScanAlwaysAvailableSettingsCompatibility()
-                .handleWifiScanAlwaysAvailableToggled(isAvailable);
+        long ident = Binder.clearCallingIdentity();
+        try {
+            mWifiInjector.getWifiScanAlwaysAvailableSettingsCompatibility()
+                    .handleWifiScanAlwaysAvailableToggled(isAvailable);
+        } finally {
+            Binder.restoreCallingIdentity(ident);
+        }
         mActiveModeWarden.scanAlwaysModeChanged();
     }