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

Commit b5cbaf47 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Revert "AudioService: anonymize Bluetooth MAC... 

Merge "RESTRICT AUTOMERGE Revert "AudioService: anonymize Bluetooth MAC addresses"" into udc-qpr-dev
parents ceeb5871 b06ba796

media/java/android/media/AudioDeviceAttributes.java

+1 −25
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public final class AudioDeviceAttributes implements Parcelable { 
    /**

     * The unique address of the device. Some devices don't have addresses, only an empty string.

     */

    private @NonNull String mAddress;

    private final @NonNull String mAddress;

    /**

     * The non-unique name of the device. Some devices don't have names, only an empty string.

     * Should not be used as a unique identifier for a device.
@@ -186,21 +186,6 @@ public final class AudioDeviceAttributes implements Parcelable { 
        mAudioDescriptors = new ArrayList<>();

    }



    /**

     * @hide

     * Copy Constructor.

     * @param ada the copied AudioDeviceAttributes

     */

    public AudioDeviceAttributes(AudioDeviceAttributes ada) {

        mRole = ada.getRole();

        mType = ada.getType();

        mAddress = ada.getAddress();

        mName = ada.getName();

        mNativeType = ada.getInternalType();

        mAudioProfiles = ada.getAudioProfiles();

        mAudioDescriptors = ada.getAudioDescriptors();

    }



    /**

     * @hide

     * Returns the role of a device
@@ -231,15 +216,6 @@ public final class AudioDeviceAttributes implements Parcelable { 
        return mAddress;

    }



    /**

     * @hide

     * Sets the device address. Only used by audio service.

     */

    public void setAddress(@NonNull String address) {

        Objects.requireNonNull(address);

        mAddress = address;

    }



    /**

     * @hide

     * Returns the name of the audio device, or an empty string for devices without one

services/core/java/com/android/server/audio/AdiDeviceState.java

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ import java.util.Objects; 


    @Override

    public String toString() {

        return "type: " + mDeviceType

                + " internal type: 0x" + Integer.toHexString(mInternalDeviceType)

        return "type: " + mDeviceType + "internal type: " + mInternalDeviceType

                + " addr: " + mDeviceAddress + " bt audio type: "

                + AudioManager.audioDeviceCategoryToString(mAudioDeviceCategory)

                + " enabled: " + mSAEnabled + " HT: " + mHasHeadTracker

services/core/java/com/android/server/audio/AudioDeviceBroker.java

+6 −11
Original line number Diff line number Diff line
@@ -1250,8 +1250,8 @@ public class AudioDeviceBroker { 
    }



    /*package*/ void registerStrategyPreferredDevicesDispatcher(

            @NonNull IStrategyPreferredDevicesDispatcher dispatcher, boolean isPrivileged) {

        mDeviceInventory.registerStrategyPreferredDevicesDispatcher(dispatcher, isPrivileged);

            @NonNull IStrategyPreferredDevicesDispatcher dispatcher) {

        mDeviceInventory.registerStrategyPreferredDevicesDispatcher(dispatcher);

    }



    /*package*/ void unregisterStrategyPreferredDevicesDispatcher(
@@ -1260,8 +1260,8 @@ public class AudioDeviceBroker { 
    }



    /*package*/ void registerStrategyNonDefaultDevicesDispatcher(

            @NonNull IStrategyNonDefaultDevicesDispatcher dispatcher, boolean isPrivileged) {

        mDeviceInventory.registerStrategyNonDefaultDevicesDispatcher(dispatcher, isPrivileged);

            @NonNull IStrategyNonDefaultDevicesDispatcher dispatcher) {

        mDeviceInventory.registerStrategyNonDefaultDevicesDispatcher(dispatcher);

    }



    /*package*/ void unregisterStrategyNonDefaultDevicesDispatcher(
@@ -1279,8 +1279,8 @@ public class AudioDeviceBroker { 
    }



    /*package*/ void registerCapturePresetDevicesRoleDispatcher(

            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher, boolean isPrivileged) {

        mDeviceInventory.registerCapturePresetDevicesRoleDispatcher(dispatcher, isPrivileged);

            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher) {

        mDeviceInventory.registerCapturePresetDevicesRoleDispatcher(dispatcher);

    }



    /*package*/ void unregisterCapturePresetDevicesRoleDispatcher(
@@ -1288,11 +1288,6 @@ public class AudioDeviceBroker { 
        mDeviceInventory.unregisterCapturePresetDevicesRoleDispatcher(dispatcher);

    }



    /* package */ List<AudioDeviceAttributes> anonymizeAudioDeviceAttributesListUnchecked(

            List<AudioDeviceAttributes> devices) {

        return mAudioService.anonymizeAudioDeviceAttributesListUnchecked(devices);

    }



    /*package*/ void registerCommunicationDeviceDispatcher(

            @NonNull ICommunicationDeviceDispatcher dispatcher) {

        mCommDevDispatchers.register(dispatcher);

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+9 −43
Original line number Diff line number Diff line
@@ -120,26 +120,6 @@ public class AudioDeviceInventory { 
        }

    }



    /**

     * Adds a new entry in mDeviceInventory if the AudioDeviceAttributes passed is an sink

     * Bluetooth device and no corresponding entry already exists.

     * @param ada the device to add if needed

     */

    void addAudioDeviceInInventoryIfNeeded(AudioDeviceAttributes ada) {

        if (!AudioSystem.isBluetoothOutDevice(ada.getInternalType())) {

            return;

        }

        synchronized (mDeviceInventoryLock) {

            if (findDeviceStateForAudioDeviceAttributes(ada, ada.getType()) != null) {

                return;

            }

            AdiDeviceState ads = new AdiDeviceState(

                    ada.getType(), ada.getInternalType(), ada.getAddress());

            mDeviceInventory.put(ads.getDeviceId(), ads);

        }

        mDeviceBroker.persistAudioDeviceSettings();

    }



    /**

     * Adds a new AdiDeviceState or updates the audio device cateogory of the matching

     * AdiDeviceState in the {@link AudioDeviceInventory#mDeviceInventory} list.
@@ -1012,8 +992,8 @@ public class AudioDeviceInventory { 




    /*package*/ void registerStrategyPreferredDevicesDispatcher(

            @NonNull IStrategyPreferredDevicesDispatcher dispatcher, boolean isPrivileged) {

        mPrefDevDispatchers.register(dispatcher, isPrivileged);

            @NonNull IStrategyPreferredDevicesDispatcher dispatcher) {

        mPrefDevDispatchers.register(dispatcher);

    }



    /*package*/ void unregisterStrategyPreferredDevicesDispatcher(
@@ -1022,8 +1002,8 @@ public class AudioDeviceInventory { 
    }



    /*package*/ void registerStrategyNonDefaultDevicesDispatcher(

            @NonNull IStrategyNonDefaultDevicesDispatcher dispatcher, boolean isPrivileged) {

        mNonDefDevDispatchers.register(dispatcher, isPrivileged);

            @NonNull IStrategyNonDefaultDevicesDispatcher dispatcher) {

        mNonDefDevDispatchers.register(dispatcher);

    }



    /*package*/ void unregisterStrategyNonDefaultDevicesDispatcher(
@@ -1104,8 +1084,8 @@ public class AudioDeviceInventory { 
    }



    /*package*/ void registerCapturePresetDevicesRoleDispatcher(

            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher, boolean isPrivileged) {

        mDevRoleCapturePresetDispatchers.register(dispatcher, isPrivileged);

            @NonNull ICapturePresetDevicesRoleDispatcher dispatcher) {

        mDevRoleCapturePresetDispatchers.register(dispatcher);

    }



    /*package*/ void unregisterCapturePresetDevicesRoleDispatcher(
@@ -1434,8 +1414,6 @@ public class AudioDeviceInventory { 
                    updateBluetoothPreferredModes_l(connect ? btDevice : null /*connectedDevice*/);

                    if (!connect) {

                        purgeDevicesRoles_l();

                    } else {

                        addAudioDeviceInInventoryIfNeeded(attributes);

                    }

                }

                mmi.set(MediaMetrics.Property.STATE, MediaMetrics.Value.CONNECTED).record();
@@ -1724,7 +1702,6 @@ public class AudioDeviceInventory { 
        setCurrentAudioRouteNameIfPossible(name, true /*fromA2dp*/);



        updateBluetoothPreferredModes_l(btInfo.mDevice /*connectedDevice*/);

        addAudioDeviceInInventoryIfNeeded(ada);

    }



    static final int[] CAPTURE_PRESETS = new int[] {AudioSource.MIC, AudioSource.CAMCORDER,
@@ -2029,9 +2006,9 @@ public class AudioDeviceInventory { 
        final int hearingAidVolIndex = mDeviceBroker.getVssVolumeForDevice(streamType,

                AudioSystem.DEVICE_OUT_HEARING_AID);

        mDeviceBroker.postSetHearingAidVolumeIndex(hearingAidVolIndex, streamType);

        AudioDeviceAttributes ada = new AudioDeviceAttributes(

                AudioSystem.DEVICE_OUT_HEARING_AID, address, name);

        mAudioSystem.setDeviceConnectionState(ada,



        mAudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(

                AudioSystem.DEVICE_OUT_HEARING_AID, address, name),

                AudioSystem.DEVICE_STATE_AVAILABLE,

                AudioSystem.AUDIO_FORMAT_DEFAULT);

        mConnectedDevices.put(
@@ -2041,7 +2018,6 @@ public class AudioDeviceInventory { 
        mDeviceBroker.postApplyVolumeOnDevice(streamType,

                AudioSystem.DEVICE_OUT_HEARING_AID, "makeHearingAidDeviceAvailable");

        setCurrentAudioRouteNameIfPossible(name, false /*fromA2dp*/);

        addAudioDeviceInInventoryIfNeeded(ada);

        new MediaMetrics.Item(mMetricsId + "makeHearingAidDeviceAvailable")

                .set(MediaMetrics.Property.ADDRESS, address != null ? address : "")

                .set(MediaMetrics.Property.DEVICE,
@@ -2152,7 +2128,6 @@ public class AudioDeviceInventory { 
                            sensorUuid));

            mDeviceBroker.postAccessoryPlugMediaUnmute(device);

            setCurrentAudioRouteNameIfPossible(name, /*fromA2dp=*/false);

            addAudioDeviceInInventoryIfNeeded(ada);

        }



        if (streamType == AudioSystem.STREAM_DEFAULT) {
@@ -2487,9 +2462,6 @@ public class AudioDeviceInventory { 
        final int nbDispatchers = mPrefDevDispatchers.beginBroadcast();

        for (int i = 0; i < nbDispatchers; i++) {

            try {

                if (!((Boolean) mPrefDevDispatchers.getBroadcastCookie(i))) {

                    devices = mDeviceBroker.anonymizeAudioDeviceAttributesListUnchecked(devices);

                }

                mPrefDevDispatchers.getBroadcastItem(i).dispatchPrefDevicesChanged(

                        strategy, devices);

            } catch (RemoteException e) {
@@ -2503,9 +2475,6 @@ public class AudioDeviceInventory { 
        final int nbDispatchers = mNonDefDevDispatchers.beginBroadcast();

        for (int i = 0; i < nbDispatchers; i++) {

            try {

                if (!((Boolean) mNonDefDevDispatchers.getBroadcastCookie(i))) {

                    devices = mDeviceBroker.anonymizeAudioDeviceAttributesListUnchecked(devices);

                }

                mNonDefDevDispatchers.getBroadcastItem(i).dispatchNonDefDevicesChanged(

                        strategy, devices);

            } catch (RemoteException e) {
@@ -2519,9 +2488,6 @@ public class AudioDeviceInventory { 
        final int nbDispatchers = mDevRoleCapturePresetDispatchers.beginBroadcast();

        for (int i = 0; i < nbDispatchers; ++i) {

            try {

                if (!((Boolean) mDevRoleCapturePresetDispatchers.getBroadcastCookie(i))) {

                    devices = mDeviceBroker.anonymizeAudioDeviceAttributesListUnchecked(devices);

                }

                mDevRoleCapturePresetDispatchers.getBroadcastItem(i).dispatchDevicesRoleChanged(

                        capturePreset, role, devices);

            } catch (RemoteException e) {

services/core/java/com/android/server/audio/AudioService.java

+26 −183

File changed.

Preview size limit exceeded, changes collapsed.