Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8359cfb authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev

parents b2b02092 b29814c4

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

+4 −1
Original line number Diff line number Diff line
@@ -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.