Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e9351608: Merge change 25406 into eclair

Browse Source 
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp

* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
  remove the signin required notification as when the signin is successful
This commit is contained in:
Fred Quintana
2009-09-17 08:46:32 -07:00
committed by Android Git Automerger
parent 893056c636 e9351608c6
commit a1112e4cda
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/accounts/AccountManagerService.java
View File

@@ -46,7 +46,6 @@ import android.util.Pair;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.Notification; import android.app.Notification;
import android.app.Activity;
import android.Manifest; import android.Manifest;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -471,6 +470,7 @@ public class AccountManagerService extends IAccountManager.Stub {
} }
private boolean saveAuthTokenToDatabase(Account account, String type, String authToken) { private boolean saveAuthTokenToDatabase(Account account, String type, String authToken) {
cancelNotification(getSigninRequiredNotificationId(account));
SQLiteDatabase db = mOpenHelper.getWritableDatabase(); SQLiteDatabase db = mOpenHelper.getWritableDatabase();
db.beginTransaction(); db.beginTransaction();
try { try {
@@ -523,7 +523,7 @@ public class AccountManagerService extends IAccountManager.Stub {
checkAuthenticateAccountsPermission(account); checkAuthenticateAccountsPermission(account);
long identityToken = clearCallingIdentity(); long identityToken = clearCallingIdentity();
try { try {
cacheAuthToken(account, authTokenType, authToken); saveAuthTokenToDatabase(account, authTokenType, authToken);
} finally { } finally {
restoreCallingIdentity(identityToken); restoreCallingIdentity(identityToken);
} }
@@ -686,7 +686,8 @@ public class AccountManagerService extends IAccountManager.Stub {
"the type and name should not be empty"); "the type and name should not be empty");
return; return;
} }
cacheAuthToken(new Account(name, type), authTokenType, authToken); saveAuthTokenToDatabase(new Account(name, type),
authTokenType, authToken);
} }
Intent intent = result.getParcelable(Constants.INTENT_KEY); Intent intent = result.getParcelable(Constants.INTENT_KEY);
@@ -1004,10 +1005,6 @@ public class AccountManagerService extends IAccountManager.Stub {
} }
} }
private boolean cacheAuthToken(Account account, String authTokenType, String authToken) {
return saveAuthTokenToDatabase(account, authTokenType, authToken);
}
private long getAccountId(SQLiteDatabase db, Account account) { private long getAccountId(SQLiteDatabase db, Account account) {
Cursor cursor = db.query(TABLE_ACCOUNTS, new String[]{ACCOUNTS_ID}, Cursor cursor = db.query(TABLE_ACCOUNTS, new String[]{ACCOUNTS_ID},
"name=? AND type=?", new String[]{account.name, account.type}, null, null, null); "name=? AND type=?", new String[]{account.name, account.type}, null, null, null);