diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:36:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:36:55 -0700 |
| commit | ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed (patch) | |
| tree | f7da48d8a34c885a822148e9702a8bd0df868540 | |
| parent | 2b544c9f0ea139d052664be0be465c2315707081 (diff) | |
| parent | bcb62f099a8619c1045df54e33d43cde85af4036 (diff) | |
| download | frameworks_base-ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed.zip frameworks_base-ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed.tar.gz frameworks_base-ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed.tar.bz2 | |
merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
| -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); |