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

Commit 7045f33c authored by Joe Antonetti's avatar Joe Antonetti Committed by Android (Google) Code Review
Browse files

Merge "[Handoff][1/N] Add FLAG_TASK_CONTINUITY" into main

parents 6104d63a 4b647d33
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -10365,6 +10365,7 @@ package android.companion {
    field public static final String EXTRA_ASSOCIATION = "android.companion.extra.ASSOCIATION";
    field @Deprecated public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";
    field public static final int FLAG_CALL_METADATA = 1; // 0x1
    field @FlaggedApi("android.companion.enable_task_continuity") public static final int FLAG_TASK_CONTINUITY = 2; // 0x2
    field public static final int RESULT_CANCELED = 0; // 0x0
    field public static final int RESULT_DISCOVERY_TIMEOUT = 2; // 0x2
    field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3
+10 −3
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ public final class CompanionDeviceManager {
    /** @hide */
    @IntDef(flag = true, prefix = { "FLAG_" }, value = {
            FLAG_CALL_METADATA,
            FLAG_TASK_CONTINUITY,
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface DataSyncTypes {}
@@ -208,10 +209,16 @@ public final class CompanionDeviceManager {
    /**
     * Used by {@link #enableSystemDataSyncForTypes(int, int)}}.
     * Sync call metadata like muting, ending and silencing a call.
     *
     */
    public static final int FLAG_CALL_METADATA = 1;

    /**
     * Used by {@link #enableSystemDataSyncForTypes(int, int)}}.
     * Synchronize task continuity data like open tasks, and enable this transport for Handoff.
     */
    @FlaggedApi(Flags.FLAG_ENABLE_TASK_CONTINUITY)
    public static final int FLAG_TASK_CONTINUITY = 2;

    /**
     * A device, returned in the activity result of the {@link IntentSender} received in
     * {@link Callback#onDeviceFound}
@@ -605,7 +612,7 @@ public final class CompanionDeviceManager {
    }

    /**
     * <p>Enable system data sync (it only supports call metadata sync for now).
     * <p>Enable system data sync.
     * By default all supported system data types are enabled.</p>
     *
     * <p>Calling this API requires a uses-feature
@@ -628,7 +635,7 @@ public final class CompanionDeviceManager {
    }

    /**
     * <p>Disable system data sync (it only supports call metadata sync for now).
     * <p>Disable system data sync.
     * By default all supported system data types are enabled.</p>
     *
     * <p>Calling this API requires a uses-feature