diff options
Diffstat (limited to 'tests/src/com/android/browser/tests/utils/ProviderTestCase3.java')
-rw-r--r-- | tests/src/com/android/browser/tests/utils/ProviderTestCase3.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java b/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java index c3742926..536163a4 100644 --- a/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java +++ b/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java @@ -69,6 +69,11 @@ public abstract class ProviderTestCase3<T extends ContentProvider> extends Andro public Context getApplicationContext() { return this; } + + @Override + public Object getSystemService(String name) { + return null; + } } /** * Constructor. @@ -114,7 +119,15 @@ public abstract class ProviderTestCase3<T extends ContentProvider> extends Andro //delegated to getContext(), // The context that file methods are delegated to filenamePrefix); - mProviderContext = new IsolatedContext(mResolver, targetContextWrapper); + // The default IsolatedContext has a mock AccountManager that doesn't + // work for us, so override getSystemService to always return null + mProviderContext = new IsolatedContext(mResolver, targetContextWrapper) { + + @Override + public Object getSystemService(String name) { + return null; + } + }; mProvider = mProviderClass.newInstance(); mProvider.attachInfo(mProviderContext, null); |