From c17a2423defca0905efbccc4b0a31edae39c7b24 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 16 Jul 2020 09:43:05 -0700
Subject: AudioDeviceInfo: make TYPE_REMOTE_SUBMIX public

SUBMIX type can be returned by routing query APIs such as
MediaPlayer.getRoutedDevice(), make it public.

Bug: 160819170
Test: atest AudioHostTest#testTwoChannelCapturingCheckSubmixDevice
Change-Id: Ie5854ad86464c40137d0a1b10420116bc5cc270e
---
 api/current.txt                               |  1 +
 api/system-current.txt                        |  4 ----
 media/java/android/media/AudioDeviceInfo.java | 15 ++++++++-------
 non-updatable-api/current.txt                 |  1 +
 non-updatable-api/system-current.txt          |  4 ----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 651cda564ee9..4972cfaa8c04 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24079,6 +24079,7 @@ package android.media {
     field public static final int TYPE_IP = 20; // 0x14
     field public static final int TYPE_LINE_ANALOG = 5; // 0x5
     field public static final int TYPE_LINE_DIGITAL = 6; // 0x6
+    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19
     field public static final int TYPE_TELEPHONY = 18; // 0x12
     field public static final int TYPE_TV_TUNER = 17; // 0x11
     field public static final int TYPE_UNKNOWN = 0; // 0x0
diff --git a/api/system-current.txt b/api/system-current.txt
index fa4543001f90..11db781dd42f 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4172,10 +4172,6 @@ package android.media {
     field public static final int ROLE_OUTPUT = 2; // 0x2
   }
 
-  public final class AudioDeviceInfo {
-    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19
-  }
-
   public final class AudioFocusInfo implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public android.media.AudioAttributes getAttributes();
diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java
index 00a4c7e19f34..6e3fb1991acc 100644
--- a/media/java/android/media/AudioDeviceInfo.java
+++ b/media/java/android/media/AudioDeviceInfo.java
@@ -18,7 +18,6 @@ package android.media;
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
-import android.annotation.SystemApi;
 import android.util.SparseIntArray;
 
 import java.lang.annotation.Retention;
@@ -137,13 +136,15 @@ public final class AudioDeviceInfo {
      */
     public static final int TYPE_BUILTIN_SPEAKER_SAFE = 24;
     /**
-     * @hide
      * A device type for rerouting audio within the Android framework between mixes and
-     * system applications. Typically created when using
-     * {@link android.media.audiopolicy.AudioPolicy} for mixes created with the
-     * {@link android.media.audiopolicy.AudioMix#ROUTE_FLAG_RENDER} flag.
-     */
-    @SystemApi
+     * system applications.
+     * This type is for instance encountered when querying the output device of a track
+     * (with {@link AudioTrack#getRoutedDevice()} playing from a device in screen mirroring mode,
+     * where the audio is not heard on the device, but on the remote device.
+     */
+    // Typically created when using
+    // {@link android.media.audiopolicy.AudioPolicy} for mixes created with the
+    // {@link android.media.audiopolicy.AudioMix#ROUTE_FLAG_LOOP_BACK} flag.
     public static final int TYPE_REMOTE_SUBMIX = 25;
 
     /** @hide */
diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt
index c14f23f6ace0..8ed34125f1a7 100644
--- a/non-updatable-api/current.txt
+++ b/non-updatable-api/current.txt
@@ -24061,6 +24061,7 @@ package android.media {
     field public static final int TYPE_IP = 20; // 0x14
     field public static final int TYPE_LINE_ANALOG = 5; // 0x5
     field public static final int TYPE_LINE_DIGITAL = 6; // 0x6
+    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19
     field public static final int TYPE_TELEPHONY = 18; // 0x12
     field public static final int TYPE_TV_TUNER = 17; // 0x11
     field public static final int TYPE_UNKNOWN = 0; // 0x0
diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt
index b41ab93295b5..222e563d4f96 100644
--- a/non-updatable-api/system-current.txt
+++ b/non-updatable-api/system-current.txt
@@ -4112,10 +4112,6 @@ package android.media {
     field public static final int ROLE_OUTPUT = 2; // 0x2
   }
 
-  public final class AudioDeviceInfo {
-    field public static final int TYPE_REMOTE_SUBMIX = 25; // 0x19
-  }
-
   public final class AudioFocusInfo implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public android.media.AudioAttributes getAttributes();
-- 
cgit v1.2.3-59-g8ed1b