am b32a74c7: am ee1cdd0e: merge from open-source master

2010-05-19 09:44:20 -07:00
parent 09603c0339 b32a74c73b
commit 6af002b739
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/content/ContentService.java
+++ b/core/java/android/content/ContentService.java
@@ -537,6 +537,9 @@ public final class ContentService extends IContentService.Stub {

            // Look to see if the proper child already exists
            String segment = getUriSegment(uri, index);
+            if (segment == null) {
+                throw new IllegalArgumentException("Invalid Uri (" + uri + ") used for observer");
+            }
            int N = mChildren.size();
            for (int i = 0; i < N; i++) {
                ObserverNode node = mChildren.get(i);