commit 24c1aa50143855beb12c4b71f932eb06ac55a162
author Ying Xu <yinxu@google.com> Thu Apr 18 23:13:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 18 23:13:50 2019 +0000
tree f0ce70612eb9266e8fdcea097cba7a892f3a582f
parent 132569fa1cca3eb9d864383db78fb7b401129aba
parent 612a819bdba4f4f6d10c7a686b75e5f3a80af208

Merge "Clear the caller identity after the permission is verified"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 12db135..080740f 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(