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

Merge "Check PackageManager for feature before getting system service" into qt-dev

Browse Source
This commit is contained in:
Kevin Chyn
2019-04-20 02:26:16 +00:00
committed by Android (Google) Code Review
parent dd0b1d9bd8 1e50792d72
commit 5e052537b7
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
keystore/java/android/security/keystore/KeymasterUtils.java
View File

@@ -16,6 +16,7 @@
package android.security.keystore;
import android.content.pm.PackageManager;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.security.GateKeeper;
@@ -122,12 +123,20 @@ public abstract class KeymasterUtils {
}
if (spec.getUserAuthenticationValidityDurationSeconds() == -1) {
PackageManager pm = KeyStore.getApplicationContext().getPackageManager();
// Every use of this key needs to be authorized by the user. This currently means
// fingerprint or face auth.
FingerprintManager fingerprintManager =
KeyStore.getApplicationContext().getSystemService(FingerprintManager.class);
FaceManager faceManager =
KeyStore.getApplicationContext().getSystemService(FaceManager.class);
FingerprintManager fingerprintManager = null;
FaceManager faceManager = null;
if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
fingerprintManager = KeyStore.getApplicationContext()
.getSystemService(FingerprintManager.class);
}
if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
faceManager = KeyStore.getApplicationContext().getSystemService(FaceManager.class);
}
// TODO: Restore USE_FINGERPRINT permission check in
// FingerprintManager.getAuthenticatorId once the ID is no longer needed here.
final long fingerprintOnlySid =