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

Commit b1d0f0df authored by Raphael Kim's avatar Raphael Kim
Browse files

[CDM] Add trunk stable flags for companion transports 

Bug: 304478692
Test: m
Change-Id: Ibda0ae60e0a76841ed0f408eac8951677b7c7595
parent 1c391eac

core/api/module-lib-current.txt

+11 −11
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ package android { 
    field public static final String CONTROL_AUTOMOTIVE_GNSS = "android.permission.CONTROL_AUTOMOTIVE_GNSS";

    field public static final String GET_INTENT_SENDER_INTENT = "android.permission.GET_INTENT_SENDER_INTENT";

    field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";

    field public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS";

    field @FlaggedApi("android.companion.flags.companion_transport_apis") public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS";

  }



}
@@ -85,21 +85,21 @@ package android.app.admin { 
package android.companion {



  public final class CompanionDeviceManager {

    method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener(@NonNull java.util.concurrent.Executor, int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);

    method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);

    method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);

    method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);

    method @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int, @NonNull byte[], @NonNull int[]);

    field public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 1667729539; // 0x63678883

    field public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 1669491075; // 0x63826983

    field public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 1669494629; // 0x63827765

    method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnMessageReceivedListener(@NonNull java.util.concurrent.Executor, int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);

    method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void addOnTransportsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);

    method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnMessageReceivedListener(int, @NonNull android.companion.CompanionDeviceManager.OnMessageReceivedListener);

    method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void removeOnTransportsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnTransportsChangedListener);

    method @FlaggedApi("android.companion.companion_transport_apis") @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS) public void sendMessage(int, @NonNull byte[], @NonNull int[]);

    field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 1667729539; // 0x63678883

    field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 1669491075; // 0x63826983

    field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 1669494629; // 0x63827765

  }



  public static interface CompanionDeviceManager.OnMessageReceivedListener {

  @FlaggedApi("android.companion.companion_transport_apis") public static interface CompanionDeviceManager.OnMessageReceivedListener {

    method public void onMessageReceived(int, @NonNull byte[]);

  }



  public static interface CompanionDeviceManager.OnTransportsChangedListener {

  @FlaggedApi("android.companion.companion_transport_apis") public static interface CompanionDeviceManager.OnTransportsChangedListener {

    method public void onTransportsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);

  }

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ package android.companion { 


  public final class CompanionDeviceManager {

    method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void enableSecureTransport(boolean);

    field public static final int MESSAGE_REQUEST_PING = 1669362552; // 0x63807378

    field @FlaggedApi("android.companion.companion_transport_apis") public static final int MESSAGE_REQUEST_PING = 1669362552; // 0x63807378

  }



  public abstract class CompanionDeviceService extends android.app.Service {

core/java/android/companion/CompanionDeviceManager.java

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH; 
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -216,12 +217,14 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @TestApi public static final int MESSAGE_REQUEST_PING = 0x63807378; // ?PIN

    /**

     * Message header assigned to the remote authentication handshakes.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int MESSAGE_REQUEST_REMOTE_AUTHENTICATION = 0x63827765; // ?RMA

    /**
@@ -229,6 +232,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int MESSAGE_REQUEST_CONTEXT_SYNC = 0x63678883; // ?CXS

    /**
@@ -236,6 +240,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 0x63826983; // ?RES
@@ -873,6 +878,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public interface OnTransportsChangedListener {

        /**
@@ -892,6 +898,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)

    public void addOnTransportsChangedListener(
@@ -913,6 +920,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)

    public void removeOnTransportsChangedListener(
@@ -934,6 +942,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)

    public void sendMessage(int messageType, @NonNull byte[] data, @NonNull int[] associationIds) {
@@ -951,6 +960,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public interface OnMessageReceivedListener {

        /**
@@ -964,6 +974,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)

    public void addOnMessageReceivedListener(
@@ -983,6 +994,7 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.USE_COMPANION_TRANSPORTS)

    public void removeOnMessageReceivedListener(int messageType,

core/java/android/companion/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
    description: "Controls if the new Builder is exposed to test apis."

    bug: "296251481"

}



flag {

    name: "companion_transport_apis"

    namespace: "companion"

    description: "Grants access to the companion transport apis."

    bug: "288297505"

}
 
 No newline at end of file

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -5668,7 +5668,8 @@ 
                android:description="@string/permdesc_deliverCompanionMessages"

                android:protectionLevel="normal" />



    <!-- @hide @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES)

    <!-- @hide @FlaggedApi("android.companion.flags.companion_transport_apis")

         @SystemApi(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES)

         Allows an application to send and receive messages via CDM transports.

    -->

    <permission android:name="android.permission.USE_COMPANION_TRANSPORTS"