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

Fix the build

Browse Source 
Change-Id: I24e697e989b5f88c3f5e61343fbff60a09aa4c12
This commit is contained in:
Svetoslav
2015-04-30 11:30:33 -07:00
parent 3327f3d688
commit 2dac95d033
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keystore/java/android/security/KeyStore.java
View File

@@ -16,6 +16,8 @@
package android.security;
import android.app.ActivityThread;
import android.app.Application;
import com.android.org.conscrypt.NativeConstants;
import android.content.Context;
@@ -625,18 +627,31 @@ public class KeyStore {
return 0;
}
String opPackageName = getMyOpPackageName();
try {
long deviceId = 0; // TODO: plumb hardware id to FPMS
if (!service.isHardwareDetected(deviceId)) {
if (!service.isHardwareDetected(deviceId, opPackageName)) {
return 0;
}
return service.getAuthenticatorId();
return service.getAuthenticatorId(opPackageName);
} catch (RemoteException e) {
throw new IllegalStateException("Failed to communicate with fingerprint service", e);
}
}
private static String getMyOpPackageName() {
ActivityThread activityThread = ActivityThread.currentActivityThread();
if (activityThread != null) {
Application application = activityThread.getApplication();
if (application != null) {
return application.getOpPackageName();
}
}
throw new IllegalStateException("Cannot create AudioRecord outside of an app");
}
/**
* Returns an {@link InvalidKeyException} corresponding to the provided keystore/keymaster error
* code.