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

am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev

Browse Source 
* commit '16422b25f7a814be0c3ceba44a4e9e62b10427a5':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
This commit is contained in:
Jeff Brown
2015-06-04 21:18:40 +00:00
committed by Android Git Automerger
parent 1319e2f82b 16422b25f7
commit 017efadc2e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/content/ContentResolver.java
View File

@@ -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 * @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. * for a whole class of content.
* @param notifyForDescendents If <code>true</code> changes to URIs beginning with <code>uri</code> * @param notifyForDescendents When false, the observer will be notified whenever a
* will also cause notifications to be sent. If <code>false</code> only changes to the exact URI * change occurs to the exact URI specified by <code>uri</code> or to one of the
* specified by <em>uri</em> will cause notifications to be sent. If <code>true</code>, any URI values * URI's ancestors in the path hierarchy. When true, the observer will also be notified
* at or below the specified URI will also trigger a match. * whenever a change occurs to the URI's descendants in the path hierarchy.
* @param observer The object that receives callbacks when changes occur. * @param observer The object that receives callbacks when changes occur.
* @see #unregisterContentObserver * @see #unregisterContentObserver
*/ */
public final void registerContentObserver(Uri uri, boolean notifyForDescendents, public final void registerContentObserver(Uri uri, boolean notifyForDescendents,
ContentObserver observer) ContentObserver observer) {
{
registerContentObserver(uri, notifyForDescendents, observer, UserHandle.myUserId()); registerContentObserver(uri, notifyForDescendents, observer, UserHandle.myUserId());
} }
/** @hide - designated user version */ /** @hide - designated user version */
public final void registerContentObserver(Uri uri, boolean notifyForDescendents, public final void registerContentObserver(Uri uri, boolean notifyForDescendents,
ContentObserver observer, int userHandle) ContentObserver observer, int userHandle) {
{
try { try {
getContentService().registerContentObserver(uri, notifyForDescendents, getContentService().registerContentObserver(uri, notifyForDescendents,
observer.getContentObserver(), userHandle); observer.getContentObserver(), userHandle);

7
core/java/android/util/StateSet.java
View File

@@ -119,7 +119,14 @@ public class StateSet {
/** @hide */ /** @hide */
public StateSet() {} public StateSet() {}
/**
* A state specification that will be matched by all StateSets.
*/
public static final int[] WILD_CARD = new int[0]; 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 }; public static final int[] NOTHING = new int[] { 0 };
/** /**