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

Commit cfb47211 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 

am: d273f0d6

* commit 'd273f0d6':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I8e01e1695c6860d04655b9be06d2f10afc72d3e9
parents 11bd8bd2 d273f0d6

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7885,6 +7885,7 @@ package android.content { 
    method public static boolean isSyncPending(android.accounts.Account, java.lang.String);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, boolean);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, int);

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
@@ -7915,6 +7916,8 @@ package android.content { 
    field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";

    field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";

    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -8183,6 +8183,7 @@ package android.content { 
    method public static boolean isSyncPending(android.accounts.Account, java.lang.String);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, boolean);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, int);

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
@@ -8213,6 +8214,8 @@ package android.content { 
    field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";

    field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";

    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7890,6 +7890,7 @@ package android.content { 
    method public static boolean isSyncPending(android.accounts.Account, java.lang.String);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, boolean);

    method public void notifyChange(android.net.Uri, android.database.ContentObserver, int);

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;

    method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
@@ -7920,6 +7921,8 @@ package android.content { 
    field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";

    field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";

    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

core/java/android/content/ContentResolver.java

+73 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.content;



import android.accounts.Account;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -60,6 +61,8 @@ import java.io.FileNotFoundException; 
import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStream;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;

import java.util.Random;
@@ -289,6 +292,31 @@ public abstract class ContentResolver { 
    /** @hide */

    public static final int SYNC_OBSERVER_TYPE_ALL = 0x7fffffff;



    /** @hide */

    @IntDef(flag = true,

            value = {

                NOTIFY_SYNC_TO_NETWORK,

                NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS

            })

    @Retention(RetentionPolicy.SOURCE)

    public @interface NotifyFlags {}



    /**

     * Flag for {@link #notifyChange(Uri, ContentObserver, int)}: attempt to sync the change

     * to the network.

     */

    public static final int NOTIFY_SYNC_TO_NETWORK = 1<<0;



    /**

     * Flag for {@link #notifyChange(Uri, ContentObserver, int)}: if set, this notification

     * will be skipped if it is being delivered to the root URI of a ContentObserver that is

     * using "notify for descendants."  The purpose of this is to allow the provide to send

     * a general notification of "something under X" changed that observers of that specific

     * URI can receive, while also sending a specific URI under X.  It would use this flag

     * when sending the former, so that observers of "X and descendants" only see the latter.

     */

    public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 1<<1;



    // Always log queries which take 500ms+; shorter queries are

    // sampled accordingly.

    private static final boolean ENABLE_CONTENT_SAMPLE = false;
@@ -1676,7 +1704,7 @@ public abstract class ContentResolver { 
     * The observer that originated the change will only receive the notification if it

     * has requested to receive self-change notifications by implementing

     * {@link ContentObserver#deliverSelfNotifications()} to return true.

     * @param syncToNetwork If true, attempt to sync the change to the network.

     * @param syncToNetwork If true, same as {@link #NOTIFY_SYNC_TO_NETWORK}.

     * @see #requestSync(android.accounts.Account, String, android.os.Bundle)

     */

    public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer,
@@ -1689,6 +1717,32 @@ public abstract class ContentResolver { 
                ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId()));

    }



    /**

     * Notify registered observers that a row was updated.

     * To register, call {@link #registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver) registerContentObserver()}.

     * By default, CursorAdapter objects will get this notification.

     * If syncToNetwork is true, this will attempt to schedule a local sync using the sync

     * adapter that's registered for the authority of the provided uri. No account will be

     * passed to the sync adapter, so all matching accounts will be synchronized.

     *

     * @param uri The uri of the content that was changed.

     * @param observer The observer that originated the change, may be <code>null</null>.

     * The observer that originated the change will only receive the notification if it

     * has requested to receive self-change notifications by implementing

     * {@link ContentObserver#deliverSelfNotifications()} to return true.

     * @param flags Additional flags: {@link #NOTIFY_SYNC_TO_NETWORK}.

     * @see #requestSync(android.accounts.Account, String, android.os.Bundle)

     */

    public void notifyChange(@NonNull Uri uri, @Nullable ContentObserver observer,

            @NotifyFlags int flags) {

        Preconditions.checkNotNull(uri, "uri");

        notifyChange(

                ContentProvider.getUriWithoutUserId(uri),

                observer,

                flags,

                ContentProvider.getUserIdFromUri(uri, UserHandle.myUserId()));

    }



    /**

     * Notify registered observers within the designated user(s) that a row was updated.

     *
@@ -1699,7 +1753,24 @@ public abstract class ContentResolver { 
        try {

            getContentService().notifyChange(

                    uri, observer == null ? null : observer.getContentObserver(),

                    observer != null && observer.deliverSelfNotifications(), syncToNetwork,

                    observer != null && observer.deliverSelfNotifications(),

                    syncToNetwork ? NOTIFY_SYNC_TO_NETWORK : 0,

                    userHandle);

        } catch (RemoteException e) {

        }

    }



    /**

     * Notify registered observers within the designated user(s) that a row was updated.

     *

     * @hide

     */

    public void notifyChange(Uri uri, ContentObserver observer, @NotifyFlags int flags,

            @UserIdInt int userHandle) {

        try {

            getContentService().notifyChange(

                    uri, observer == null ? null : observer.getContentObserver(),

                    observer != null && observer.deliverSelfNotifications(), flags,

                    userHandle);

        } catch (RemoteException e) {

        }

core/java/android/content/IContentService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ interface IContentService { 
     *     USER_CURRENT are properly interpreted.

     */

    void notifyChange(in Uri uri, IContentObserver observer,

            boolean observerWantsSelfNotifications, boolean syncToNetwork,

            boolean observerWantsSelfNotifications, int flags,

            int userHandle);



    void requestSync(in Account account, String authority, in Bundle extras);