Workaround ConnectivityManager SecurityException on Android 11

Issue: #9002 PiperOrigin-RevId: 395221648
google · Sep 16, 2021 · 140e110 · 140e110
1 parent aa88e0b
commit 140e110
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -13,6 +13,11 @@
     *   Request smaller decoder input buffers for Dolby Vision. This fixes an
         issue that could cause UHD Dolby Vision playbacks to fail on some
         devices, including Amazon Fire TV 4K.
+*   Downloads and caching:
+    *   Workaround platform issue that can cause a `SecurityException` to be
+        thrown from `Requirements.isInternetConnectivityValidated` on devices
+        running Android 11
+        ([#9002](https://github.com/google/ExoPlayer/issues/9002)).
 *   Cast extension:
     *   Implement `CastPlayer.setPlaybackParameters(PlaybackParameters)` to
         support setting the playback speed

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
@@ -210,11 +210,17 @@ private static boolean isInternetConnectivityValidated(ConnectivityManager conne
     if (activeNetwork == null) {
       return false;
     }
-    @Nullable
-    NetworkCapabilities networkCapabilities =
-        connectivityManager.getNetworkCapabilities(activeNetwork);
-    return networkCapabilities != null
-        && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+
+    try {
+      @Nullable
+      NetworkCapabilities networkCapabilities =
+          connectivityManager.getNetworkCapabilities(activeNetwork);
+      return networkCapabilities != null
+          && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+    } catch (SecurityException e) {
+      // Workaround for https://issuetracker.google.com/issues/175055271.
+      return true;
+    }
   }
 
   @Override