sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java - Issue 1194423002: Don't check for USE_CREDENTIALS permission on Android M.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.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 | « base/android/java/src/org/chromium/base/BuildInfo.java ('k') | ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

index 4d2b292172bbc04b3a969f836ea510d2bd5a575a..4d323750f2be71ad4eeb7692e9426f1b701ffb49 100644

--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

@@ -21,6 +21,7 @@ import android.os.Bundle;

import android.os.Process;

import android.util.Log;

+import org.chromium.base.BuildInfo;

import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.net.NetworkChangeNotifier;

@@ -259,8 +260,9 @@ public class AccountManagerHelper {

}

private boolean hasUseCredentialsPermission() {

- return mApplicationContext.checkPermission(Manifest.permission.USE_CREDENTIALS,

- Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED;

+ return BuildInfo.isMncOrLater()

+ || mApplicationContext.checkPermission(Manifest.permission.USE_CREDENTIALS,

+ Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED;

}

// Gets the auth token synchronously