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

Fix NPE cause by new fingerprint permission check

Browse Source 
We no longer send fingerprintid to non-privileged apps. Though
Keyguard can get the permission, it does not currently use fingerprint
info, so remove the API call.

Fixes bug 21040383

Change-Id: I8a9461ed138c368afc75601fe6d4eadc9a8b91c5
This commit is contained in:
Jim Miller
2015-06-08 19:24:13 -07:00
parent 800ebfc166
commit 4f364c9e5f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -205,7 +205,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
handleScreenTurnedOn();
break;
case MSG_FINGERPRINT_AUTHENTICATED:
handleFingerprintAuthenticated(msg.arg1, msg.arg2);
handleFingerprintAuthenticated();
break;
case MSG_FINGERPRINT_HELP:
handleFingerprintHelp(msg.arg1 /* msgId */, (String) msg.obj /* errString */);
@@ -348,7 +348,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
handleFingerprintHelp(-1, mContext.getString(R.string.fingerprint_not_recognized));
}
private void handleFingerprintAuthenticated(int fingerId, int groupId) {
private void handleFingerprintAuthenticated() {
try {
final int userId;
try {
@@ -524,9 +524,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
@Override
public void onAuthenticationSucceeded(AuthenticationResult result) {
mHandler.obtainMessage(MSG_FINGERPRINT_AUTHENTICATED,
result.getFingerprint().getFingerId(),
result.getFingerprint().getGroupId()).sendToTarget();
mHandler.obtainMessage(MSG_FINGERPRINT_AUTHENTICATED).sendToTarget();
}
@Override