Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Release wakelock when binder died or exception occurs"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-03 02:53:16 +00:00
committed by Android (Google) Code Review
parent 302a8b09c7 71d04218a7
commit 36497cd21f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/fingerprint/FingerprintService.java
View File

@@ -941,9 +941,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
@Override
public void sendResult(Bundle data) throws RemoteException {
if (mWakeLock.isHeld()) {
mWakeLock.release();
}
releaseWakelock();
}
});
} catch (DeadObjectException e) {
@@ -951,6 +949,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
mHandler.post(mRemoveCallbackRunnable);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to invoke onLockoutReset: ", e);
releaseWakelock();
}
}
}
@@ -958,9 +957,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
private final Runnable mRemoveCallbackRunnable = new Runnable() {
@Override
public void run() {
if (mWakeLock.isHeld()) {
mWakeLock.release();
}
releaseWakelock();
removeLockoutResetCallback(FingerprintServiceLockoutResetMonitor.this);
}
};
@@ -970,6 +967,12 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
Slog.e(TAG, "Lockout reset callback binder died");
mHandler.post(mRemoveCallbackRunnable);
}
private void releaseWakelock() {
if (mWakeLock.isHeld()) {
mWakeLock.release();
}
}
}
private IBiometricsFingerprintClientCallback mDaemonCallback =