diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-11 01:39:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 01:39:43 +0000 |
| commit | 3767d85caac8eec6c7c219de3d0a000fca18ad8b (patch) | |
| tree | 9b9da591a849e393824367db91c7215a0a4a4688 | |
| parent | 5cf89a011932f1af9361e7b713e33ff5c5af3e61 (diff) | |
| parent | f8359cfb93e349771388709b160ae1b9d3f880b3 (diff) | |
| download | frameworks_base-3767d85caac8eec6c7c219de3d0a000fca18ad8b.zip frameworks_base-3767d85caac8eec6c7c219de3d0a000fca18ad8b.tar.gz frameworks_base-3767d85caac8eec6c7c219de3d0a000fca18ad8b.tar.bz2 | |
am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
Don't show fingerprint cancellation messages in keyguard
| -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 8e5d4d6..7b67c6c 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 @@ -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. |