commit 8ec617ad8dba0443067071a21adb5b499c38942a
author Cody Kesting <ckesting@google.com> Mon Mar 22 15:14:14 2021 -0700
committer Cody Kesting <ckesting@google.com> Mon Mar 22 16:02:33 2021 -0700
tree f03a22f245a3724078f37abcf25aeafc93c1b259
parent 79ddf1afb8db511c3586e8dac932c711bb3c0f57

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

diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index 6c18cde..d561ab9 100644
--- a/services/core/java/com/android/server/VcnManagementService.java
+++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -821,8 +821,7 @@
 
             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 */);