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

Merge change 23824 into eclair

Browse Source 
* changes:
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
This commit is contained in:
Android (Google) Code Review
2009-09-03 14:16:57 -07:00
parent 19d6f7ac27 904de61465
commit 7a260ba968
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test-runner/android/test/IsolatedContext.java
View File

@@ -4,6 +4,7 @@ import com.google.android.collect.Lists;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdatedListener; import android.accounts.OnAccountsUpdatedListener;
import android.accounts.Account;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
@@ -101,6 +102,10 @@ public class IsolatedContext extends ContextWrapper {
Handler handler, boolean updateImmediately) { Handler handler, boolean updateImmediately) {
// do nothing // do nothing
} }
public Account[] getAccounts() {
return new Account[]{};
}
} }
@Override @Override
public File getFilesDir() { public File getFilesDir() {