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

2020-04-09 15:20:04 +00:00
parent 0131d50188 0d106018db
commit 1f1b416da9
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -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");
            }