Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8456883 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Cache correct calling UID for VcnStatusCallbacks." am: 7510bf5e am:... 

Merge "Cache correct calling UID for VcnStatusCallbacks." am: 7510bf5e am: ff059848 am: d7c4c0cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649649

Change-Id: Ifc9c9a6cbbcdc415899b3fee0ce8601e0107aab7
parents 86364aab d7c4c0cf

services/core/java/com/android/server/VcnManagementService.java

+1 −2
Original line number Diff line number Diff line
@@ -820,8 +820,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 */);