diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:45:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 09:45:51 -0700 |
| commit | a2f2a34d51fe3bd9f5a00a61e5d8cf1224671f5b (patch) | |
| tree | 1ec492bb24c95e151d1193d67686fb63aaa075c1 /core/java | |
| parent | b3f4e15725d89568a06fc2772a581f17c6d61ca9 (diff) | |
| parent | 6af002b73965664242d3b61e7053710f52d786bc (diff) | |
| download | frameworks_base-a2f2a34d51fe3bd9f5a00a61e5d8cf1224671f5b.zip frameworks_base-a2f2a34d51fe3bd9f5a00a61e5d8cf1224671f5b.tar.gz frameworks_base-a2f2a34d51fe3bd9f5a00a61e5d8cf1224671f5b.tar.bz2 | |
am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/ContentService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/ContentService.java b/core/java/android/content/ContentService.java index 377e383..fc2dfc0 100644 --- 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); |