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

Commit 0d106018 authored by Jon Spivack's avatar Jon Spivack
Browse files

ApexManager: Allow blocking Binder calls 

When ApexManager switched from using ServiceManager.getService to using Binder.waitForService to retrieve apexservice, it lost the call to Binder.allowBlocking that was inside getService. Since ApexManager currently makes several synchronous binder calls, this call is needed to avoid Log.wtf()s.

Bug: 153360345
Test: atest ApexManagerTest
Change-Id: I6016477b20754a6dc0f31588bae4e679f08a1ba2
parent 1be609a3

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");

            }