Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d4714d authored by Max Bires's avatar Max Bires Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8377daf08aa276c5922e5cc32bdb1fb845896393
parents 216e0820 74473819

keystore/java/android/security/GenerateRkpKey.java

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.os.RemoteException; 
import android.util.Log;



import java.util.concurrent.CountDownLatch;

import java.util.concurrent.Executor;

import java.util.concurrent.Executors;

import java.util.concurrent.TimeUnit;



/**
@@ -88,7 +90,8 @@ public class GenerateRkpKey { 
        }

        intent.setComponent(comp);

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

        }

        try {