commit 923bd87366167e0a569883993e9ec5b19104657a
author Dianne Hackborn <hackbod@google.com> Wed Feb 27 01:22:58 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 01:22:59 2013 +0000
tree d6e695320d97c467d16fe12fd7d33163cff8c31a
parent a6a9fa802d1b56c206c670ca1d313bc64effcb5d
parent 6800627f331da6be1ea7cc82202eb6d94588c44f

Merge "Call new init function to use for testing, to turn off app ops." into jb-mr2-dev

tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java

diff --git a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
index 96cbb9b..be14f45 100644
--- a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
+++ b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
@@ -63,7 +63,7 @@
         private MatrixCursor mResponse;
 
         @Override
-        public void attachInfo(Context context, ProviderInfo info) {
+        public void attachInfoForTesting(Context context, ProviderInfo info) {
             mAuthority = info.authority;
         }
 

tests/src/com/android/providers/contacts/ContactsActor.java

diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index 7a30244..8da2800 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -199,7 +199,7 @@
         ContentProvider provider = providerClass.newInstance();
         ProviderInfo info = new ProviderInfo();
         info.authority = authority;
-        provider.attachInfo(mProviderContext, info);
+        provider.attachInfoForTesting(mProviderContext, info);
         resolver.addProvider(authority, provider);
         return provider;
     }