commit 1da57acea4ea1e6bc4d43777c3b8c76d946c1a70
author Hall Liu <hallliu@google.com> Sat Apr 27 03:45:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 27 03:45:24 2019 +0000
tree 7c4e12dd735f50d1bb7f9e46aa124acd7e1b093f
parent bbdee69011c260a68c97b247d1ac15ae922a1602
parent bac7d48db5fcd0724c785e94373261897165708e

Merge "Pass callingUid and callingPid to startNetworkScan"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 46c2847..c00ccf4 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4449,11 +4449,13 @@
                 }
             }
         }
+        int callingUid = Binder.getCallingUid();
+        int callingPid = Binder.getCallingPid();
         final long identity = Binder.clearCallingIdentity();
         try {
             return mNetworkScanRequestTracker.startNetworkScan(
                     request, messenger, binder, getPhone(subId),
-                    callingPackage);
+                    callingUid, callingPid, callingPackage);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
@@ -4490,9 +4492,10 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "stopNetworkScan");
 
+        int callingUid = Binder.getCallingUid();
         final long identity = Binder.clearCallingIdentity();
         try {
-            mNetworkScanRequestTracker.stopNetworkScan(scanId);
+            mNetworkScanRequestTracker.stopNetworkScan(scanId, callingUid);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }