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

Commit f2a9447e authored by Joël Stemmer's avatar Joël Stemmer Committed by Android (Google) Code Review
Browse files

Merge "Add new transport flag for cross platform transfers" into main

parents f8d196a0 b8bdf4c1

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9289,6 +9289,7 @@ package android.app.backup { 
    method public void onRestoreFile(android.os.ParcelFileDescriptor, long, java.io.File, int, long, long) throws java.io.IOException;

    method public void onRestoreFinished();

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

    field @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") public static final int FLAG_CROSS_PLATFORM_DATA_TRANSFER_IOS = 8; // 0x8

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

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

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

core/java/android/app/backup/BackupAgent.java

+13 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app.backup;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.Nullable;

import android.app.IBackupAgent;
@@ -186,6 +187,16 @@ public abstract class BackupAgent extends ContextWrapper { 
     */

    public static final int FLAG_SKIP_RESTORE_FOR_LAUNCHED_APPS = 1 << 2;



    /**

     * Flag for {@link BackupDataOutput#getTransportFlags()} and {@link

     * FullBackupDataOutput#getTransportFlags()} only.

     *

     * <p>Indicates this is a cross-platform transfer to or from iOS. The user's backup data is sent

     * directly to another device over e.g. USB or WiFi.

     */

    @FlaggedApi(Flags.FLAG_ENABLE_CROSS_PLATFORM_TRANSFER)

    public static final int FLAG_CROSS_PLATFORM_DATA_TRANSFER_IOS = 1 << 3;



    /**

     * Flag for {@link BackupDataOutput#getTransportFlags()} and {@link

     * FullBackupDataOutput#getTransportFlags()} only.
@@ -203,7 +214,8 @@ public abstract class BackupAgent extends ContextWrapper { 
            value = {

                FLAG_CLIENT_SIDE_ENCRYPTION_ENABLED,

                FLAG_DEVICE_TO_DEVICE_TRANSFER,

                FLAG_FAKE_CLIENT_SIDE_ENCRYPTION_ENABLED

                FLAG_FAKE_CLIENT_SIDE_ENCRYPTION_ENABLED,

                FLAG_CROSS_PLATFORM_DATA_TRANSFER_IOS

            })

    public @interface BackupTransportFlags {}