Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia1c30f52aea037efbc6cff7b923227359ce9d1f0
This commit is contained in:
TreeHugger Robot
2020-04-09 15:56:59 +00:00
committed by Automerger Merge Worker
parent 15886aa841 76885afe19
commit 06eb74d664
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/ApexManager.java
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");
}