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

Change-Id: I4584d7352fd41ad3327c92676769421d2af6ae4b
This commit is contained in:
TreeHugger Robot
2020-04-09 15:56:47 +00:00
committed by Automerger Merge Worker

View File

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