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

Change-Id: I0d8050eae7dc45ae63c5eaec98e28aa44c61a3f5
This commit is contained in:
TreeHugger Robot
2020-04-09 15:38:37 +00:00
committed by Automerger Merge Worker

View File

@@ -399,7 +399,9 @@ public abstract class ApexManager {
@VisibleForTesting @VisibleForTesting
protected IApexService waitForApexService() { protected IApexService waitForApexService() {
try { 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) { } catch (RemoteException e) {
throw new IllegalStateException("Required service apexservice not available"); throw new IllegalStateException("Required service apexservice not available");
} }