commit bc6e34f6d6fb24fc5aa2ad9a1b77bb7ec2ff238d
author Ying Xu <yinxu@google.com> Thu Apr 18 16:43:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 18 16:43:12 2019 -0700
tree ed1030db764f1890604e76907863849d7f46a5f8
parent 5a8db23fb56818438913c4c467f9bd23054e1262
parent 7e6c8cddfc7aa2af038da87c47104040877476f9

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

Change-Id: If362cbbb54722165b162b13dd7395353f78be901

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 2246f7d..6e3b8ae 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4450,9 +4450,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(