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

Commit 9697c6c5 authored by jiabin's avatar jiabin
Browse files

Make back mic available when getting all available mic. 

Remove the checkType of filtering back mic. Make getAddress() public in
AudioDeviceInfo to distinguish different built in mic.

Bug: 64038649
Test: run cts
Change-Id: I943b7f74f44db7068644f5ffa1b5410cbf567f11
parent 32ca41d0

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21926,6 +21926,7 @@ package android.media { 
  }















  public final class AudioDeviceInfo {













    method public java.lang.String getAddress();















    method public int[] getChannelCounts();















    method public int[] getChannelIndexMasks();















    method public int[] getChannelMasks();










@@ -25122,6 +25123,7 @@ package android.media {













  }





























  public final class MicrophoneInfo {













    method public java.lang.String getAddress();















    method public java.util.List<android.util.Pair<java.lang.Integer, java.lang.Integer>> getChannelMapping();















    method public java.lang.String getDescription();















    method public int getDirectionality();

























media/java/android/media/AudioDeviceInfo.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -226,11 +226,10 @@ public final class AudioDeviceInfo {













    }































    /**













     * @hide















     * @return The "address" string of the device. This generally contains device-specific















     * parameters.















     */













    public String getAddress() {













    public @NonNull String getAddress() {















        return mPort.address();















    }

















































media/java/android/media/AudioManager.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -4595,8 +4595,7 @@ public class AudioManager {





























    private static boolean checkTypes(AudioDevicePort port) {















        return AudioDeviceInfo.convertInternalDeviceToDeviceType(port.type()) !=













                    AudioDeviceInfo.TYPE_UNKNOWN &&













                port.type() != AudioSystem.DEVICE_IN_BACK_MIC;













                    AudioDeviceInfo.TYPE_UNKNOWN;















    }































    /**

































media/java/android/media/MicrophoneInfo.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.media;































import android.annotation.IntDef;













import android.annotation.NonNull;















import android.util.Pair;































import java.lang.annotation.Retention;










@@ -224,12 +225,11 @@ public final class MicrophoneInfo {













    }































    /**













     * @hide















     * Returns The "address" string of the microphone that corresponds to the















     * address returned by {@link AudioDeviceInfo#getAddress()}















     * @return the address of the microphone















     */













    public String getAddress() {













    public @NonNull String getAddress() {















        return mAddress;















    }