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

Commit 4a81d4c3 authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "[V] Hide CDM transports APIs." into main

parents d40a9f41 52a76cd1

core/api/module-lib-current.txt

+0 −24
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 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 @FlaggedApi("android.companion.flags.companion_transport_apis") public static final String USE_COMPANION_TRANSPORTS = "android.permission.USE_COMPANION_TRANSPORTS";

  }



}
@@ -82,29 +81,6 @@ package android.app.admin { 


}



package android.companion {



  public final class CompanionDeviceManager {

    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

  }



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

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

  }



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

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

  }



}



package android.content {



  public abstract class ContentProvider implements android.content.ComponentCallbacks2 {

core/api/test-current.txt

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


  public final class CompanionDeviceManager {

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

    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

+1 −23
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMIN 
import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION;

import static android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER;

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;
@@ -219,31 +218,24 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

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

    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

    /**

     * Message header assigned to the telecom context sync metadata.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

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

    /**

     * Message header assigned to the permission restore request.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 0x63826983; // ?RES



    /**
@@ -905,8 +897,6 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public interface OnTransportsChangedListener {

        /**

         * Invoked when a transport is attached or detached.
@@ -925,8 +915,6 @@ 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(

            @NonNull @CallbackExecutor Executor executor,
@@ -947,8 +935,6 @@ 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(

            @NonNull OnTransportsChangedListener listener) {
@@ -969,8 +955,6 @@ 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) {

        try {
@@ -987,8 +971,6 @@ public final class CompanionDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_COMPANION_TRANSPORT_APIS)

    @SystemApi(client = MODULE_LIBRARIES)

    public interface OnMessageReceivedListener {

        /**

         * Called when a message is received.
@@ -1001,8 +983,6 @@ 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(

            @NonNull @CallbackExecutor Executor executor, int messageType,
@@ -1021,8 +1001,6 @@ 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,

            @NonNull OnMessageReceivedListener listener) {

core/res/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -5702,11 +5702,10 @@ 
                android:protectionLevel="normal" />



    <!-- @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"

        android:protectionLevel="signature|module" />

        android:protectionLevel="signature" />



    <!-- Allows an application to create new companion device associations.

         @SystemApi