Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the API compatibility of "UriMatcher#addURI"

Browse Source 
The previous patch (ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.

Bug: 29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
This commit is contained in:
Hidehiko Tsuchiya
2014-03-25 18:27:27 +09:00
committed by Fyodor Kupolov
parent 877d6e75e6
commit 5acd41d155
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/UriMatcher.java
View File

@@ -167,7 +167,7 @@ public class UriMatcher
if (path != null) {
String newPath = path;
// Strip leading slash if present.
if (path.length() > 0 && path.charAt(0) == '/') {
if (path.length() > 1 && path.charAt(0) == '/') {
newPath = path.substring(1);
}
tokens = newPath.split("/");

24
core/tests/coretests/src/android/net/UriMatcherTest.java
View File

@@ -82,9 +82,31 @@ public class UriMatcherTest extends TestCase {
checkAll(matcher);
}
@SmallTest
public void testContentUrisWithLeadingSlashAndOnlySlash() {
UriMatcher matcher = new UriMatcher(ROOT);
matcher.addURI("people", "/", PEOPLE);
matcher.addURI("people", "/#", PEOPLE_ID);
matcher.addURI("people", "/#/phones", PEOPLE_PHONES);
matcher.addURI("people", "/#/phones/blah", PEOPLE_PHONES_ID);
matcher.addURI("people", "/#/phones/#", PEOPLE_PHONES_ID);
matcher.addURI("people", "/#/addresses", PEOPLE_ADDRESSES);
matcher.addURI("people", "/#/addresses/#", PEOPLE_ADDRESSES_ID);
matcher.addURI("people", "/#/contact-methods", PEOPLE_CONTACTMETH);
matcher.addURI("people", "/#/contact-methods/#", PEOPLE_CONTACTMETH_ID);
matcher.addURI("calls", "/", CALLS);
matcher.addURI("calls", "/#", CALLS_ID);
matcher.addURI("caller-id", "/", CALLERID);
matcher.addURI("caller-id", "/*", CALLERID_TEXT);
matcher.addURI("filter-recent", null, FILTERRECENT);
matcher.addURI("auth", "/another/path/segment", ANOTHER_PATH_SEGMENT);
checkAll(matcher);
}
private void checkAll(UriMatcher matcher) {
check("content://asdf", UriMatcher.NO_MATCH, matcher);
check("content://people", PEOPLE, matcher);
check("content://people/", PEOPLE, matcher);
check("content://people/1", PEOPLE_ID, matcher);
check("content://people/asdf", UriMatcher.NO_MATCH, matcher);
check("content://people/2/phones", PEOPLE_PHONES, matcher);
@@ -97,9 +119,11 @@ public class UriMatcherTest extends TestCase {
check("content://people/2/contact-methods/3", PEOPLE_CONTACTMETH_ID, matcher);
check("content://people/2/contact-methods/asdf", UriMatcher.NO_MATCH, matcher);
check("content://calls", CALLS, matcher);
check("content://calls/", CALLS, matcher);
check("content://calls/1", CALLS_ID, matcher);
check("content://calls/asdf", UriMatcher.NO_MATCH, matcher);
check("content://caller-id", CALLERID, matcher);
check("content://caller-id/", CALLERID, matcher);
check("content://caller-id/asdf", CALLERID_TEXT, matcher);
check("content://caller-id/1", CALLERID_TEXT, matcher);
check("content://filter-recent", FILTERRECENT, matcher);