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

Commit 1117ca31 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Call timeout callbacks on executor too 

Test: atest PermissionControllerTest
Change-Id: I23832d6ff992e7417e0a0128ef94203b2a435cb7
parent 339ecba5

core/java/android/permission/PermissionControllerManager.java

+9 −1
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ public final class PermissionControllerManager { 
        private final boolean mDoDryRun;

        private final int mReason;

        private final @NonNull String mCallingPackage;

        private final @NonNull Executor mExecutor;

        private final @NonNull OnRevokeRuntimePermissionsCallback mCallback;



        private final @NonNull RemoteCallback mRemoteCallback;
@@ -324,6 +325,7 @@ public final class PermissionControllerManager { 
            mDoDryRun = doDryRun;

            mReason = reason;

            mCallingPackage = callingPackage;

            mExecutor = executor;

            mCallback = callback;



            mRemoteCallback = new RemoteCallback(result -> executor.execute(() -> {
@@ -358,7 +360,13 @@ public final class PermissionControllerManager { 


        @Override

        protected void onTimeout(RemoteService remoteService) {

            mCallback.onRevokeRuntimePermissions(Collections.emptyMap());

            long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(

                        () -> mCallback.onRevokeRuntimePermissions(Collections.emptyMap()));

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }



        @Override