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

Unified Diff: ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java

Issue 1194423002: Don't check for USE_CREDENTIALS permission on Android M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 5 years, 6 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 | « sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
diff --git a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
index 7e31ec95717d40741cdda94bbabea8ce93ae8020..b11297c238fc15977839324d7ff2d65d4f73c2e2 100644
--- a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
@@ -11,15 +11,14 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentSender.SendIntentException;
import android.content.pm.PackageManager;
-import android.os.Build;
import android.os.Handler;
import android.os.Process;
-import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;
import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus;
+import org.chromium.base.BuildInfo;
import org.chromium.ui.UiUtils;
import java.lang.ref.WeakReference;
@@ -199,10 +198,7 @@ public class ActivityWindowAndroid
mHandler.removeCallbacks(mClearPermissionRequestsTask);
// TODO(tedchoc): Remove the MNC check once the SDK version is bumped.
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1
- && !TextUtils.equals("MNC", Build.VERSION.CODENAME)) {
- return false;
- }
+ if (!BuildInfo.isMncOrLater()) return false;
// TODO(tedchoc): Remove the reflection aspect of this once a public M SDK is available.
Activity activity = mActivityRef.get();
« no previous file with comments | « sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698