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

Commit 76885afe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ApexManager: Allow blocking Binder calls" into rvc-dev am: 1f1b416d 

Change-Id: Ib6aea5ba7520a8e27a25df37c1f0cad31fa901c0
parents 5e377847 1f1b416d

services/core/java/com/android/server/pm/ApexManager.java

+3 −1
Original line number Diff line number Diff line
@@ -399,7 +399,9 @@ public abstract class ApexManager { 
        @VisibleForTesting

        protected IApexService waitForApexService() {

            try {

                return IApexService.Stub.asInterface(Binder.waitForService("apexservice"));

                // Since apexd is a trusted platform component, synchronized calls are allowable

                return IApexService.Stub.asInterface(

                        Binder.allowBlocking(Binder.waitForService("apexservice")));

            } catch (RemoteException e) {

                throw new IllegalStateException("Required service apexservice not available");

            }