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

am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

Browse Source 
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
  Don't show fingerprint cancellation messages in keyguard
This commit is contained in:
Jorim Jaggi
2015-08-11 01:39:43 +00:00
committed by Android Git Automerger
parent 5cf89a0119 f8359cfb93
commit 3767d85caa
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -29,6 +29,7 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.hardware.fingerprint.FingerprintManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
@@ -601,6 +602,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
}
private final BroadcastReceiver mDevicePolicyReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
post(new Runnable() {
@Override
@@ -681,7 +683,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
@Override
public void onFingerprintError(int msgId, String errString) {
if (!KeyguardUpdateMonitor.getInstance(mContext).isUnlockingWithFingerprintAllowed()) {
if (!KeyguardUpdateMonitor.getInstance(mContext).isUnlockingWithFingerprintAllowed()
|| msgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
return;
}
// TODO: Go to bouncer if this is "too many attempts" (lockout) error.