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

Commit fa4b13da authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev 

am: c48f414a

Change-Id: Ic42d1b2c81a610708f1dce0b62e16e14adc956ef
parents 1838cb9f c48f414a

services/core/java/com/android/server/fingerprint/FingerprintService.java

+3 −1
Original line number Diff line number Diff line
@@ -921,8 +921,10 @@ public class FingerprintService extends SystemService implements IHwBinder.Death 


                        @Override

                        public void sendResult(Bundle data) throws RemoteException {

                            if (mWakeLock.isHeld()) {

                                mWakeLock.release();

                            }

                        }

                    });

                } catch (DeadObjectException e) {

                    Slog.w(TAG, "Death object while invoking onLockoutReset: ", e);