From 708dc6cab99c9f31eb4eb94c047cc2babcc874cc Mon Sep 17 00:00:00 2001 From: Copybara-Service Date: Wed, 26 Jun 2024 06:05:07 -0700 Subject: [PATCH] Merge pull request #1487 from colinkho:main PiperOrigin-RevId: 646917527 (cherry picked from commit 6244d8605f48d1b548201a8a964a9879961b3c68) --- .../java/androidx/media3/exoplayer/WakeLockManager.java | 7 ++++--- .../java/androidx/media3/exoplayer/WifiLockManager.java | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WakeLockManager.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WakeLockManager.java index 3457688729..246d4f9b94 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WakeLockManager.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WakeLockManager.java @@ -33,14 +33,13 @@ import androidx.media3.common.util.Log; private static final String TAG = "WakeLockManager"; private static final String WAKE_LOCK_TAG = "ExoPlayer:WakeLockManager"; - @Nullable private final PowerManager powerManager; + private final Context applicationContext; @Nullable private WakeLock wakeLock; private boolean enabled; private boolean stayAwake; public WakeLockManager(Context context) { - powerManager = - (PowerManager) context.getApplicationContext().getSystemService(Context.POWER_SERVICE); + applicationContext = context.getApplicationContext(); } /** @@ -56,6 +55,8 @@ import androidx.media3.common.util.Log; public void setEnabled(boolean enabled) { if (enabled) { if (wakeLock == null) { + PowerManager powerManager = + (PowerManager) applicationContext.getSystemService(Context.POWER_SERVICE); if (powerManager == null) { Log.w(TAG, "PowerManager is null, therefore not creating the WakeLock."); return; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WifiLockManager.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WifiLockManager.java index 8bd4b0f323..a98659ef24 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WifiLockManager.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/WifiLockManager.java @@ -32,14 +32,13 @@ import androidx.media3.common.util.Log; private static final String TAG = "WifiLockManager"; private static final String WIFI_LOCK_TAG = "ExoPlayer:WifiLockManager"; - @Nullable private final WifiManager wifiManager; + private final Context applicationContext; @Nullable private WifiLock wifiLock; private boolean enabled; private boolean stayAwake; public WifiLockManager(Context context) { - wifiManager = - (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); + applicationContext = context.getApplicationContext(); } /** @@ -54,6 +53,9 @@ import androidx.media3.common.util.Log; */ public void setEnabled(boolean enabled) { if (enabled && wifiLock == null) { + WifiManager wifiManager = + (WifiManager) + applicationContext.getApplicationContext().getSystemService(Context.WIFI_SERVICE); if (wifiManager == null) { Log.w(TAG, "WifiManager is null, therefore not creating the WifiLock."); return;