sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java - Issue 1504283002: [Sync] Switch to using GoogleAuthUtil.clearToken().

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/SystemAccountManagerDelegate.java

Issue 1504283002: [Sync] Switch to using GoogleAuthUtil.clearToken(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove USE_CREDENTIALS check again :) Created 5 years 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') | sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.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/SystemAccountManagerDelegate.java

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

index d90280ab3fd3831e84f42aa09d68cc9bdf7a815e..f291ef58033f36122f0bfe3d286ef9aabc8db00f 100644

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

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

@@ -13,11 +13,11 @@ import android.accounts.AuthenticatorException;

import android.accounts.OperationCanceledException;

import android.content.Context;

import android.os.AsyncTask;

-import android.os.StrictMode;

import android.os.SystemClock;

import com.google.android.gms.auth.GoogleAuthException;

import com.google.android.gms.auth.GoogleAuthUtil;

+import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;

import com.google.android.gms.auth.UserRecoverableAuthException;

import org.chromium.base.Callback;

@@ -89,14 +89,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {

}

@Override

- public void invalidateAuthToken(String accountType, String authToken) {

- // Temporarily allowing disk access while fixing. TODO: http://crbug.com/535320

- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();

- StrictMode.allowThreadDiskReads();

+ public void invalidateAuthToken(String authToken) throws AuthException {

try {

- mAccountManager.invalidateAuthToken(accountType, authToken);

- } finally {

- StrictMode.setThreadPolicy(oldPolicy);

+ GoogleAuthUtil.clearToken(mApplicationContext, authToken);

+ } catch (GooglePlayServicesAvailabilityException ex) {

+ throw new AuthException(false /* isTransientError */, null, ex);

+ } catch (GoogleAuthException ex) {

+ throw new AuthException(false /* isTransientError */, null, ex);

+ } catch (IOException ex) {

+ throw new AuthException(true /* isTransientError */, null, ex);

}