Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b32a74c7 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am ee1cdd0e: merge from open-source master 

Merge commit 'ee1cdd0e' into kraken

* commit 'ee1cdd0e':
  Don't allow invalid Uris to be added as observers.
parents 37b0da26 ee1cdd0e

core/java/android/content/ContentService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -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);