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

am ee1cdd0e: merge from open-source master

Browse Source 
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.
This commit is contained in:
The Android Open Source Project
2010-05-19 09:43:20 -07:00
committed by Android Git Automerger
parent 37b0da26fc ee1cdd0e60
commit b32a74c73b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/ContentService.java
View File

@@ -537,6 +537,9 @@ public final class ContentService extends IContentService.Stub {
// Look to see if the proper child already exists // Look to see if the proper child already exists
String segment = getUriSegment(uri, index); String segment = getUriSegment(uri, index);
if (segment == null) {
throw new IllegalArgumentException("Invalid Uri (" + uri + ") used for observer");
}
int N = mChildren.size(); int N = mChildren.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
ObserverNode node = mChildren.get(i); ObserverNode node = mChildren.get(i);