diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-05 19:03:01 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-08-06 02:39:06 +0000 |
| commit | b29814c4ccdec4c1fbaaa3a6d633b104bee06184 (patch) | |
| tree | 0facb95f32402855856af7465e09d5d1a9f2ed83 /packages/SystemUI/src/com | |
| parent | d14c48444a40fa2f964461e2f1317bcc3e256295 (diff) | |
| download | frameworks_base-b29814c4ccdec4c1fbaaa3a6d633b104bee06184.zip frameworks_base-b29814c4ccdec4c1fbaaa3a6d633b104bee06184.tar.gz frameworks_base-b29814c4ccdec4c1fbaaa3a6d633b104bee06184.tar.bz2 | |
Don't show fingerprint cancellation messages in keyguard
Cancellation messages can come from a variety of sources
and are not user-actionable. As a result, we just shouldn't
show them.
Fixes bug 22863862
Change-Id: I2154c774fd5ac7477e01d1cbf3bdde2d1929363b
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. |