Fixed permission check in SystemAccountManagerDelegate.updateCredentials

components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java

Index: components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
index 68f7406973941afd63e4eb11ca44ccc8f5236151..14f829b2f14444733f3b7d611fef12d0e6693aa5 100644
--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
@@ -17,6 +17,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.SystemClock;
@@ -177,13 +178,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
     public void updateCredentials(
             Account account, Activity activity, final Callback<Boolean> callback) {
         ThreadUtils.assertOnUiThread();
-        if (!hasGetAccountsPermission()) {
-            ThreadUtils.postOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onResult(false);
-                }
-            });
+        if (!hasManageAccountsPermission()) {
+            if (callback != null) {
+                ThreadUtils.postOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        callback.onResult(false);
+                    }
+                });
+            }
             return;
         }
 
@@ -216,4 +219,13 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
                        Manifest.permission.GET_ACCOUNTS, Process.myPid(), Process.myUid())
                 == PackageManager.PERMISSION_GRANTED;
     }
+
+    protected boolean hasManageAccountsPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return true;
+        }
+        return ApiCompatibilityUtils.checkPermission(mApplicationContext,
+                       "android.permission.MANAGE_ACCOUNTS", Process.myPid(), Process.myUid())
+                == PackageManager.PERMISSION_GRANTED;
+    }
 }