From c976d16a74bc8380c0c2f471df75dae25badb503 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Mon, 9 Mar 2020 13:47:01 +0000 Subject: [PATCH] Simplify `WakeLockManager` and `WifiLockManager` logic. Disabling reference counting allows some checks to be removed. This is a no-op. PiperOrigin-RevId: 299829600 --- .../com/google/android/exoplayer2/WakeLockManager.java | 7 +++---- .../com/google/android/exoplayer2/WifiLockManager.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java index bd385b0849..6de302d62d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java @@ -61,6 +61,7 @@ import com.google.android.exoplayer2.util.Log; return; } wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG); + wakeLock.setReferenceCounted(false); } } @@ -92,10 +93,8 @@ import com.google.android.exoplayer2.util.Log; } if (enabled && stayAwake) { - if (!wakeLock.isHeld()) { - wakeLock.acquire(); - } - } else if (wakeLock.isHeld()) { + wakeLock.acquire(); + } else { wakeLock.release(); } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java index f37ec6ab8b..d3700a646a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java @@ -59,6 +59,7 @@ import com.google.android.exoplayer2.util.Log; return; } wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, WIFI_LOCK_TAG); + wifiLock.setReferenceCounted(false); } this.enabled = enabled; @@ -85,10 +86,8 @@ import com.google.android.exoplayer2.util.Log; } if (enabled && stayAwake) { - if (!wifiLock.isHeld()) { - wifiLock.acquire(); - } - } else if (wifiLock.isHeld()) { + wifiLock.acquire(); + } else { wifiLock.release(); } }