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

Merge change 25406 into eclair

Browse Source 
* changes:
  remove the signin required notification as when the signin is successful
This commit is contained in:
Android (Google) Code Review
2009-09-17 01:07:31 -04:00
parent e38212a22f 6dfd1382fe
commit e9351608c6
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.NotificationManager;
import android.app.Notification;
import android.app.Activity;
import android.Manifest;
import java.io.FileDescriptor;
@@ -471,6 +470,7 @@ public class AccountManagerService extends IAccountManager.Stub {
}
private boolean saveAuthTokenToDatabase(Account account, String type, String authToken) {
cancelNotification(getSigninRequiredNotificationId(account));
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
db.beginTransaction();
try {
@@ -523,7 +523,7 @@ public class AccountManagerService extends IAccountManager.Stub {
checkAuthenticateAccountsPermission(account);
long identityToken = clearCallingIdentity();
try {
cacheAuthToken(account, authTokenType, authToken);
saveAuthTokenToDatabase(account, authTokenType, authToken);
} finally {
restoreCallingIdentity(identityToken);
}
@@ -686,7 +686,8 @@ public class AccountManagerService extends IAccountManager.Stub {
"the type and name should not be empty");
return;
}
cacheAuthToken(new Account(name, type), authTokenType, authToken);
saveAuthTokenToDatabase(new Account(name, type),
authTokenType, authToken);
}
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) {
Cursor cursor = db.query(TABLE_ACCOUNTS, new String[]{ACCOUNTS_ID},
"name=? AND type=?", new String[]{account.name, account.type}, null, null, null);