From 2e21208f639c7eb5baf5e7a3ae1180b13be3b733 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 7 Sep 2021 12:52:20 +0100
Subject: [PATCH] Workaround ConnectivityManager SecurityException on Android
 11

#exofixit
#minor-release
Issue: #9002
PiperOrigin-RevId: 395221648
---
 RELEASENOTES.md                                  |  5 +++++
 .../exoplayer2/scheduler/Requirements.java       | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0f00e6f670..9258236924 100644
--- 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
index 7a2946d012..52c82443c3 100644
--- 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 @@ public final class Requirements implements Parcelable {
     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