commit 7e6c8cddfc7aa2af038da87c47104040877476f9
author Ying Xu <yinxu@google.com> Thu Apr 18 16:34:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 18 16:34:26 2019 -0700
tree 9066d7cc4c944ff2852fc711f3c85e7d1fbb37f8
parent 75fde8404db3abc213c71fef3af42f6b0a411b2e
parent 24c1aa50143855beb12c4b71f932eb06ac55a162

Merge "Clear the caller identity after the permission is verified"
am: 24c1aa5014

Change-Id: I4b1dee8f2f6c1cb6174b461b48643670195af775

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 2d60b86..02cf785 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4448,9 +4448,14 @@
                 }
             }
         }
-        return mNetworkScanRequestTracker.startNetworkScan(
-                request, messenger, binder, getPhone(subId),
-                callingPackage);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mNetworkScanRequestTracker.startNetworkScan(
+                    request, messenger, binder, getPhone(subId),
+                    callingPackage);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     private SecurityException checkNetworkRequestForSanitizedLocationAccess(