Workaround ConnectivityManager SecurityException on Android 11

#exofixit #minor-release Issue: #9002 PiperOrigin-RevId: 395221648
google · Sep 7, 2021 · 2e21208 · 2e21208
1 parent 5183eaa
commit 2e21208
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -287,6 +287,11 @@
         ([#9183](https://github.com/google/ExoPlayer/issues/9183)).
     *   Allow the timeout to be customised via
         `RtspMediaSource.Factory.setTimeoutMs`.
+*   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)).
 
 ### 2.14.1 (2021-06-11)
 

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