diff options
| author | bauerb <bauerb@chromium.org> | 2015-06-22 16:47:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-22 23:47:49 +0000 |
| commit | d74b322a46041b6838b3e0f36c0489bc9bca8554 (patch) | |
| tree | 981135e8f7763bd89db3a52baebf465a92f2c186 /sync/android | |
| parent | db7e3cda75496baa6467f3deaf27ebe928ddda47 (diff) | |
| download | chromium_src-d74b322a46041b6838b3e0f36c0489bc9bca8554.zip chromium_src-d74b322a46041b6838b3e0f36c0489bc9bca8554.tar.gz chromium_src-d74b322a46041b6838b3e0f36c0489bc9bca8554.tar.bz2 | |
Don't check for USE_CREDENTIALS permission on Android M.
BUG=501435
Review URL: https://codereview.chromium.org/1194423002
Cr-Commit-Position: refs/heads/master@{#335585}
Diffstat (limited to 'sync/android')
| -rw-r--r-- | sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 4d2b292..4d32375 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 |