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

b/5316640 fix bundle add

Browse Source 
Change-Id: I567c26f6d8fc1a0ea5827fd32f9012b979cbea71
This commit is contained in:
Costin Manolache
2011-09-14 12:52:19 -07:00
parent f9fa7543b1
commit e5847ada7b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/accounts/AccountManager.java
View File

@@ -815,7 +815,10 @@ public class AccountManager {
final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) { final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) {
if (account == null) throw new IllegalArgumentException("account is null"); if (account == null) throw new IllegalArgumentException("account is null");
if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null"); if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null");
final Bundle optionsIn = options == null ? new Bundle() : options; final Bundle optionsIn = new Bundle();
if (options != null) {
optionsIn.putAll(options);
}
optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName()); optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());
return new AmsTask(activity, handler, callback) { return new AmsTask(activity, handler, callback) {
public void doWork() throws RemoteException { public void doWork() throws RemoteException {
@@ -982,7 +985,10 @@ public class AccountManager {
if (account == null) throw new IllegalArgumentException("account is null"); if (account == null) throw new IllegalArgumentException("account is null");
if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null"); if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null");
final Bundle optionsIn = options == null ? new Bundle() : options; final Bundle optionsIn = new Bundle();
if (options != null) {
optionsIn.putAll(options);
}
optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName()); optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());
return new AmsTask(null, handler, callback) { return new AmsTask(null, handler, callback) {
public void doWork() throws RemoteException { public void doWork() throws RemoteException {
@@ -1045,14 +1051,16 @@ public class AccountManager {
final Bundle addAccountOptions, final Bundle addAccountOptions,
final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) { final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) {
if (accountType == null) throw new IllegalArgumentException("accountType is null"); if (accountType == null) throw new IllegalArgumentException("accountType is null");
final Bundle options = (addAccountOptions == null) ? new Bundle() : final Bundle optionsIn = new Bundle();
addAccountOptions; if (addAccountOptions != null) {
options.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName()); optionsIn.putAll(addAccountOptions);
}
optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());
return new AmsTask(activity, handler, callback) { return new AmsTask(activity, handler, callback) {
public void doWork() throws RemoteException { public void doWork() throws RemoteException {
mService.addAcount(mResponse, accountType, authTokenType, mService.addAcount(mResponse, accountType, authTokenType,
requiredFeatures, activity != null, options); requiredFeatures, activity != null, optionsIn);
} }
}.start(); }.start();
} }