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

Commit f799491f authored by Paul McLean's avatar Paul McLean Committed by Android (Google) Code Review
Browse files

Merge "New policy for internal and wired device names." into mnc-dev

parents fc56b88a 338f27ab

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14704,7 +14704,7 @@ package android.media { 
    method public int[] getChannelMasks();

    method public int[] getFormats();

    method public int getId();

    method public java.lang.CharSequence getName();

    method public java.lang.CharSequence getProductName();

    method public int[] getSampleRates();

    method public int getType();

    method public boolean isSink();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15917,7 +15917,7 @@ package android.media { 
    method public int[] getChannelMasks();

    method public int[] getFormats();

    method public int getId();

    method public java.lang.CharSequence getName();

    method public java.lang.CharSequence getProductName();

    method public int[] getSampleRates();

    method public int getType();

    method public boolean isSink();

media/java/android/media/AudioDeviceInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -122,8 +122,9 @@ public final class AudioDeviceInfo { 
    /**

     * @return The human-readable name of the audio device.

     */

    public CharSequence getName() {

        return mPort.name();

    public CharSequence getProductName() {

        String portName = mPort.name();

        return portName.length() != 0 ? portName : android.os.Build.MODEL;

    }



    /**

services/core/java/com/android/server/WiredAccessoryManager.java

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { 


        Log.i(TAG, "MSG_NEW_DEVICE_STATE");

        Message msg = mHandler.obtainMessage(MSG_NEW_DEVICE_STATE, headsetState,

                mHeadsetState, newName);

                mHeadsetState, "");

        mHandler.sendMessage(msg);



        mHeadsetState = headsetState;