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

Commit aac2919f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9830595 from cc03961c to tm-qpr3-release 

Change-Id: I31497f3a8513f17d6a3136c65d45da8b47b98a4f
parents 80403418 cc03961c

boot/boot-image-profile.txt

+1446 −1057

File changed.

Preview size limit exceeded, changes collapsed.

boot/preloaded-classes

+332 −3

File changed.

Preview size limit exceeded, changes collapsed.

config/boot-image-profile.txt

+2010 −1591

File changed.

Preview size limit exceeded, changes collapsed.

config/preloaded-classes

+404 −4

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+6 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.media.AudioDeviceAttributes;

import android.media.AudioManager;

import android.media.RoutingSessionInfo;

import android.os.Build;
@@ -592,9 +593,11 @@ public class LocalMediaManager implements BluetoothCallback { 
        }



        private boolean isMutingExpectedDevice(CachedBluetoothDevice cachedDevice) {

            return mAudioManager.getMutingExpectedDevice() != null

                    && cachedDevice.getAddress().equals(

                    mAudioManager.getMutingExpectedDevice().getAddress());

            AudioDeviceAttributes mutingExpectedDevice = mAudioManager.getMutingExpectedDevice();

            if (mutingExpectedDevice == null || cachedDevice == null) {

                return false;

            }

            return cachedDevice.getAddress().equals(mutingExpectedDevice.getAddress());

        }



        private List<MediaDevice> buildDisconnectedBluetoothDevice() {