Merge changes If241e329,Ib69b6987 into mnc-dev (16422b25) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -1552,23 +1552,21 @@ public abstract class ContentResolver {
		*
		* @param uri The URI to watch for changes. This can be a specific row URI, or a base URI
		* for a whole class of content.
		* @param notifyForDescendents If <code>true</code> changes to URIs beginning with <code>uri</code>
		* will also cause notifications to be sent. If <code>false</code> only changes to the exact URI
		* specified by <em>uri</em> will cause notifications to be sent. If <code>true</code>, any URI values
		* at or below the specified URI will also trigger a match.
		* @param notifyForDescendents When false, the observer will be notified whenever a
		* change occurs to the exact URI specified by <code>uri</code> or to one of the
		* URI's ancestors in the path hierarchy. When true, the observer will also be notified
		* whenever a change occurs to the URI's descendants in the path hierarchy.
		* @param observer The object that receives callbacks when changes occur.
		* @see #unregisterContentObserver
		*/
		public final void registerContentObserver(Uri uri, boolean notifyForDescendents,
		ContentObserver observer)
		{
		ContentObserver observer) {
		registerContentObserver(uri, notifyForDescendents, observer, UserHandle.myUserId());
		}

		/** @hide - designated user version */
		public final void registerContentObserver(Uri uri, boolean notifyForDescendents,
		ContentObserver observer, int userHandle)
		{
		ContentObserver observer, int userHandle) {
		try {
		getContentService().registerContentObserver(uri, notifyForDescendents,
		observer.getContentObserver(), userHandle);

core/java/android/util/StateSet.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -119,7 +119,14 @@ public class StateSet {
		/** @hide */
		public StateSet() {}

		/**
		* A state specification that will be matched by all StateSets.
		*/
		public static final int[] WILD_CARD = new int[0];

		/**
		* A state set that does not contain any valid states.
		*/
		public static final int[] NOTHING = new int[] { 0 };

		/**