diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-11 01:31:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-11 01:31:56 +0000 |
| commit | f8359cfb93e349771388709b160ae1b9d3f880b3 (patch) | |
| tree | 77c8d48860c8a4d039941f74544b54ac47d5d412 /packages/SystemUI/src/com | |
| parent | b2b020922fb51b88d34a6478209fc232702de318 (diff) | |
| parent | b29814c4ccdec4c1fbaaa3a6d633b104bee06184 (diff) | |
| download | frameworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.zip frameworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.tar.gz frameworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.tar.bz2 | |
Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev
Diffstat (limited to 'packages/SystemUI/src/com')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 6627360..42a2f90 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -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 @@ -671,7 +673,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. |