Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a260ba9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23824 into eclair 

* changes:
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
parents 19d6f7ac 904de614

test-runner/android/test/IsolatedContext.java

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import com.google.android.collect.Lists; 


import android.accounts.AccountManager;

import android.accounts.OnAccountsUpdatedListener;

import android.accounts.Account;

import android.content.ContextWrapper;

import android.content.ContentResolver;

import android.content.Intent;
@@ -101,6 +102,10 @@ public class IsolatedContext extends ContextWrapper { 
                Handler handler, boolean updateImmediately) {

            // do nothing

        }



        public Account[] getAccounts() {

            return new Account[]{};

        }

    }

    @Override

    public File getFilesDir() {