Merge "Add share activity to manifest and move file provider string (AOSP)" into nyc-dev
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 55e26ef..2b6c667 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -294,7 +294,10 @@
 
         // Remove the default account to emulate broken preferences.
         mTarget.removeDefaultAccountForTest();
-        assertTrue(mTarget.shouldShowAccountChangedNotification());
+
+        // The dialog shouldn't show up.
+        // The logic is, if there's a writable account, we'll pick it as default
+        assertFalse(mTarget.shouldShowAccountChangedNotification());
     }
 
     private static <T> Set<T> toSet(Collection<T> collection) {