commit d8710c233cdfb1e3ffc9fb251bc87ec5ca7404a3
author Makoto Onuki <omakoto@google.com> Tue Oct 02 15:41:45 2018 -0700
committer Jay Patel <pateljay@google.com> Thu Oct 25 20:06:14 2018 +0000
tree b55a62f602ce726595be514dfd97a9c4622c8690
parent 915e888a83f79f65f39e500a3f65f267cf54ee65

Fix CTS.

"content://com.android.contacts.dumpfile//A-contacts-db.zip" is now normalized
as "...dumpfile/A-...", so it no longer throws.

Change-Id: I50907eff3a163a8107dc6512bdf82a01df4d2935
Fixes:  117103229
Test: atest android.provider.cts.contacts.ContactsContract_DumpFileProviderTest#testQuery_throwsErrorWithIllegalFileName

cherry pick to pie-cts-dev
Bug: 118391647

tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java
index 18006b2..3a2f670 100644
--- a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java
@@ -29,7 +29,6 @@
     private static final String[] NOT_ALLOWED_FILES = {
             "not_allowed.txt",
             "../A-contacts-db.zip",   // ".." is not allowed.
-            "/A-contacts-db.zip",     // "/" is not allowed
             "-contacts-db.zip",       // no name prefix
             "asdf-contacts-db.zip"};
 
@@ -88,7 +87,7 @@
             return;
         }
 
-        fail("IllegalArgumentException expected but not thrown.");
+        fail("IllegalArgumentException expected but not thrown: " + uri);
     }
 
     private void assertOpenFileDescriptorThrowsError(Uri uri) {
@@ -101,6 +100,6 @@
 
         }
 
-        fail("IllegalArgumentException expected but not thrown.");
+        fail("IllegalArgumentException expected but not thrown: " + uri);
     }
 }