Revive CONTACTS_DATABASE_CREATED, and...

Remove STATUS_CHANGE_NOTIFICATION_CONTENT_URI.

Bug 33390320
Test: adb shell am instrument -w -e size small com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size medium com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size large com.android.providers.contacts.tests
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsContactsProviderWipe

Change-Id: I10052a0682cb4bde0d94f6a22c50d0cff3a253fe

1 files changed, 0 insertions, 28 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperTest.java b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperTest.java
index a9751e5f..de0c12ad 100644
--- a/tests/src/com/android/providers/contacts/ContactsDatabaseHelperTest.java
+++ b/tests/src/com/android/providers/contacts/ContactsDatabaseHelperTest.java
@@ -525,34 +525,6 @@ public class ContactsDatabaseHelperTest extends BaseContactsProvider2Test {
         assertEquals(ProviderStatus.CONTENT_URI, calledUri.get());
     }
 
-    public void testNotifyProviderStatusChange_alternate() throws Exception {
-        final AtomicReference<Uri> calledUri = new AtomicReference<>();
-
-        final Handler h = new Handler(Looper.getMainLooper());
-
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        final ContentObserver observer = new ContentObserver(h) {
-            @Override
-            public void onChange(boolean selfChange, Uri uri) {
-                calledUri.set(uri);
-                latch.countDown();
-            }
-        };
-
-        // Notify on ProviderStatus.CONTENT_URI.
-        getContext().getContentResolver().registerContentObserver(
-                ProviderStatus.STATUS_CHANGE_NOTIFICATION_CONTENT_URI,
-                /* notifyForDescendants= */ false, observer);
-
-        // This should trigger it.
-        calledUri.set(null);
-        ContactsDatabaseHelper.notifyProviderStatusChange(getContext());
-
-        assertTrue(latch.await(30, TimeUnit.SECONDS));
-        assertEquals(ProviderStatus.STATUS_CHANGE_NOTIFICATION_CONTENT_URI, calledUri.get());
-    }
-
     public void testOpenTimestamp() {
         final long startTime = System.currentTimeMillis();