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

Commit 37653f76 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

am: fa4b13da

Change-Id: Iffb5890236dadc93f66ef397ecbfbd084bd6d473
parents 43580df3 fa4b13da
Loading
Loading
Loading
Loading
+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);