Pass callingUid and callingPid to startNetworkScan
When calling NetworkScanResultTracker#startNetworkScan, include the
callingUid and callingPid arguments before clearing the calling
identity. Do the same for stopNetworkScan.
Bug: 128480460
Test: CTS
Change-Id: Ie85e0206c7d68acb8b9d879c1dc999c25aea61d3
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 08936f0..27abf25 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4448,11 +4448,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);
}
@@ -4489,9 +4491,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);
}