From 7d5f3fecad38255c4b4f13eea94d4bd4943301eb Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Wed, 9 Nov 2022 09:47:00 -0800 Subject: [PATCH] Fix ServiceNotFoundException error log when pressing power button on a device that doesn't have fingerprint sensor. Test: verified that the error is gone on a watch Change-Id: I9e15180b7f395d2e0fc3317f70daec44cf39ce81 --- .../java/com/android/server/policy/SideFpsEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/SideFpsEventHandler.java b/services/core/java/com/android/server/policy/SideFpsEventHandler.java index 8582f5424321b..2d76c5092b924 100644 --- a/services/core/java/com/android/server/policy/SideFpsEventHandler.java +++ b/services/core/java/com/android/server/policy/SideFpsEventHandler.java @@ -127,7 +127,7 @@ public class SideFpsEventHandler implements View.OnClickListener { */ public void notifyPowerPressed() { Log.i(TAG, "notifyPowerPressed"); - if (mFingerprintManager == null) { + if (mFingerprintManager == null && mSideFpsEventHandlerReady.get()) { mFingerprintManager = mContext.getSystemService(FingerprintManager.class); } if (mFingerprintManager == null) {