Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1179)

Unified Diff: webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java

Issue 1863413003: Gracefully continue if ConnectivityManager.requestNetwork fails. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Passing right variable into requestMobileNetwork Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
diff --git a/webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java b/webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
index e0af09ba86e1b9b87091097e78ebb1ebd52fc481..c4e3a901c970fc8f3b9543c309bd8838c47813c8 100644
--- a/webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
@@ -445,8 +445,16 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
registerReceiver();
if (connectivityManagerDelegate.supportNetworkCallback()) {
- mobileNetworkCallback = new NetworkCallback();
- connectivityManagerDelegate.requestMobileNetwork(mobileNetworkCallback);
+ // On Android 6.0.0, the WRITE_SETTINGS permission is necessary for
+ // requestNetwork, so it will fail. This was fixed in Android 6.0.1.
+ NetworkCallback tempNetworkCallback = new NetworkCallback();
+ try {
+ connectivityManagerDelegate.requestMobileNetwork(tempNetworkCallback);
+ } catch (java.lang.SecurityException e) {
+ Logging.w(TAG, "Unable to obtain permission to request a cellular network.");
+ tempNetworkCallback = null;
+ }
+ mobileNetworkCallback = tempNetworkCallback;
allNetworkCallback = new SimpleNetworkCallback();
connectivityManagerDelegate.registerNetworkCallback(allNetworkCallback);
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698