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

Commit 3746a7ca authored by Robert Berry's avatar Robert Berry Committed by Android (Google) Code Review
Browse files

Merge "Remove @hide from incremental flags & return code."

parents a27e962a dda88e7f

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ package android.app.backup { 
    field public static final int LOG_EVENT_ID_SIGNATURE_MISMATCH = 29; // 0x1d

    field public static final int LOG_EVENT_ID_SYSTEM_APP_NO_AGENT = 38; // 0x26

    field public static final int LOG_EVENT_ID_TRANSPORT_IS_NULL = 50; // 0x32

    field public static final int LOG_EVENT_ID_TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED = 51; // 0x33

    field public static final int LOG_EVENT_ID_UNKNOWN_VERSION = 44; // 0x2c

    field public static final int LOG_EVENT_ID_VERSIONS_MATCH = 35; // 0x23

    field public static final int LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER = 36; // 0x24
@@ -583,9 +584,12 @@ package android.app.backup { 
    method public java.lang.String transportDirName();

    field public static final int AGENT_ERROR = -1003; // 0xfffffc15

    field public static final int AGENT_UNKNOWN = -1004; // 0xfffffc14

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

    field public static final int FLAG_NON_INCREMENTAL = 4; // 0x4

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

    field public static final int NO_MORE_DATA = -1; // 0xffffffff

    field public static final int TRANSPORT_ERROR = -1000; // 0xfffffc18

    field public static final int TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED = -1006; // 0xfffffc12

    field public static final int TRANSPORT_NOT_INITIALIZED = -1001; // 0xfffffc17

    field public static final int TRANSPORT_OK = 0; // 0x0

    field public static final int TRANSPORT_PACKAGE_REJECTED = -1002; // 0xfffffc16

core/java/android/app/backup/BackupManagerMonitor.java

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ public class BackupManagerMonitor { 


    /**

     * The transport returned {@link BackupTransport#TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED}.

     * @hide

     */

    public static final int LOG_EVENT_ID_TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED = 51;

core/java/android/app/backup/BackupTransport.java

+2 −4
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ public class BackupTransport { 
     *

     * <p>This is only valid when backup manager called {@link

     * #performBackup(PackageInfo, ParcelFileDescriptor, int)} with {@link #FLAG_INCREMENTAL}.

     *

     * @hide

     */

    public static final int TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED = -1006;
@@ -73,7 +71,7 @@ public class BackupTransport { 
     * For key value backup, indicates that the backup data is a diff from a previous backup. The

     * transport must apply this diff to an existing backup to build the new backup set.

     *

     * @hide

     * @see #performBackup(PackageInfo, ParcelFileDescriptor, int)

     */

    public static final int FLAG_INCREMENTAL = 1 << 1;
@@ -81,7 +79,7 @@ public class BackupTransport { 
     * For key value backup, indicates that the backup data is a complete set, not a diff from a

     * previous backup. The transport should clear any previous backup when storing this backup.

     *

     * @hide

     * @see #performBackup(PackageInfo, ParcelFileDescriptor, int)

     */

    public static final int FLAG_NON_INCREMENTAL = 1 << 2;