From 8ec617ad8dba0443067071a21adb5b499c38942a Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Mon, 22 Mar 2021 15:14:14 -0700 Subject: Cache correct calling UID for VcnStatusCallbacks. This CL updates VcnManagementService to cache the correct UID for the caller when a VcnStatusCallback is registered. Previously, getBinderCallingUid() was checked after the calling identity was cleared. Bug: 183437200 Test: atest FrameworksVcnTests CtsVcnTestCases Change-Id: Idfa2d2aad6bc03b3d08a137f9913276057632a3b --- services/core/java/com/android/server/VcnManagementService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'services') diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index 6c18cdea51fa..d561ab96c365 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -821,8 +821,7 @@ public class VcnManagementService extends IVcnManagementService.Stub { final IBinder cbBinder = callback.asBinder(); final VcnStatusCallbackInfo cbInfo = - new VcnStatusCallbackInfo( - subGroup, callback, opPkgName, mDeps.getBinderCallingUid()); + new VcnStatusCallbackInfo(subGroup, callback, opPkgName, callingUid); try { cbBinder.linkToDeath(cbInfo, 0 /* flags */); -- cgit v1.2.3