Merge "LOHS: Use system identity for foreground check."

1 files changed, 5 insertions, 9 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 03f4faf47..3fca21892 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1329,14 +1329,9 @@ public class WifiServiceImpl extends BaseWifiService {
             return LocalOnlyHotspotCallback.ERROR_GENERIC;
         }
         enforceLocationPermission(packageName, uid);
-        long ident = Binder.clearCallingIdentity();
-        try {
-            // also need to verify that Locations services are enabled.
-            if (!mWifiPermissionsUtil.isLocationModeEnabled()) {
-                throw new SecurityException("Location mode is not enabled.");
-            }
-        } finally {
-            Binder.restoreCallingIdentity(ident);
+        // also need to verify that Locations services are enabled.
+        if (!Binder.withCleanCallingIdentity(() -> mWifiPermissionsUtil.isLocationModeEnabled())) {
+            throw new SecurityException("Location mode is not enabled.");
         }
 
         // verify that tethering is not disabled
@@ -1345,7 +1340,8 @@ public class WifiServiceImpl extends BaseWifiService {
         }
 
         // the app should be in the foreground
-        if (!mFrameworkFacade.isAppForeground(mContext, uid)) {
+        if (!Binder.withCleanCallingIdentity(
+                () -> mFrameworkFacade.isAppForeground(mContext, uid))) {
             return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE;
         }