| commit | a18ef4254d566b2b41857c356899ec98ed8e202b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu May 09 19:30:37 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu May 09 19:30:37 2024 +0000 |
| tree | 3e8f1d8a2d512dd39f875f21eed62748e6087cde | |
| parent | f80eb8eee7a76af7566431930502acd52b2d8031 [diff] | |
| parent | 49c1251441388fe3c7a62b5c834d9ea83ae42a61 [diff] |
Merge "nfc(app): Check if wakelock is held before releasing in enableInternal" into main
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 6e322e5..3df264e 100644 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java
@@ -1150,7 +1150,9 @@ return false; } } finally { - mRoutingWakeLock.release(); + if (mRoutingWakeLock.isHeld()) { + mRoutingWakeLock.release(); + } } } finally { watchDog.cancel();