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

Change-Id: I4a3244bfdb526e871f99fd75250cff63c465418c
This commit is contained in:
TreeHugger Robot
2020-04-09 16:27:56 +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");
}