Index: content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java |
index de414e2ad8f61122f9694d497df271266d8be616..43427bdeaf84d97104300bf3f3421023bb1349b7 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java |
@@ -272,9 +272,8 @@ class MediaResourceGetter { |
*/ |
@VisibleForTesting |
boolean isNetworkReliable(Context context) { |
- if (context.checkCallingOrSelfPermission( |
- android.Manifest.permission.ACCESS_NETWORK_STATE) != |
- PackageManager.PERMISSION_GRANTED) { |
+ if (context.checkCallingOrSelfPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) |
+ != PackageManager.PERMISSION_GRANTED) { |
Log.w(TAG, "permission denied to access network state"); |
return false; |
} |
@@ -342,8 +341,8 @@ class MediaResourceGetter { |
*/ |
@VisibleForTesting |
static boolean androidDeviceOk(final String model, final int sdkVersion) { |
- return !("GT-I9100".contentEquals(model) && |
- sdkVersion < android.os.Build.VERSION_CODES.JELLY_BEAN); |
+ return !("GT-I9100".contentEquals(model) |
+ && sdkVersion < android.os.Build.VERSION_CODES.JELLY_BEAN); |
} |
// The methods below can be used by unit tests to fake functionality. |