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

Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584

Change-Id: I8377daf08aa276c5922e5cc32bdb1fb845896393
This commit is contained in:
Max Bires
2021-08-13 22:44:02 +00:00
committed by Automerger Merge Worker
parent 216e08207e 7447381921
commit d3d4714d27
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystore/java/android/security/GenerateRkpKey.java
View File

@@ -25,6 +25,8 @@ import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -88,7 +90,8 @@ public class GenerateRkpKey {
} }
intent.setComponent(comp); intent.setComponent(comp);
mCountDownLatch = new CountDownLatch(1); mCountDownLatch = new CountDownLatch(1);
if (!mContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)) { Executor executor = Executors.newCachedThreadPool();
if (!mContext.bindService(intent, Context.BIND_AUTO_CREATE, executor, mConnection)) {
throw new RemoteException("Failed to bind to GenerateRkpKeyService"); throw new RemoteException("Failed to bind to GenerateRkpKeyService");
} }
try { try {