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

Commit b4603fd3 authored by Hugh Chen's avatar Hugh Chen
Browse files

Fix pixel buds icon is empty in output switcher 

MediaDevice will set a color filter in the bluetooth device icon if
the bluetooth device is not a fist pair device. But if apps didn't
have permission to get a first pair device icon, MediaDevice will
return a default bluetooth icon. In this case MediaDevice will not
set the color filter in the icon then it causes the icon to become empty.

This CL will use the drawable type to set the color filter instead of
checking whether it is a first pair device.

Bug: 174279607
Test: make -j42 RunSettingsRoboTests
Change-Id: Ic5c348900db3e79e669173ec4ceeaec4d6500e5f
parent a2402d95

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.media; 
import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2Info;

import android.media.MediaRouter2Manager;

import android.media.MediaRouter2Manager;
@@ -56,8 +57,9 @@ public class BluetoothMediaDevice extends MediaDevice { 




    @Override

    @Override

    public Drawable getIcon() {

    public Drawable getIcon() {

        final Drawable drawable = getIconWithoutBackground();

        final Drawable drawable =

        if (!isFastPairDevice()) {

                BluetoothUtils.getBtDrawableWithDescription(mContext, mCachedDevice).first;

        if (!(drawable instanceof BitmapDrawable)) {

            setColorFilter(drawable);

            setColorFilter(drawable);

        }

        }

        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);

        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
@@ -65,9 +67,7 @@ public class BluetoothMediaDevice extends MediaDevice { 




    @Override

    @Override

    public Drawable getIconWithoutBackground() {

    public Drawable getIconWithoutBackground() {

        return isFastPairDevice()

        return BluetoothUtils.getBtClassDrawableWithDescription(mContext, mCachedDevice).first;

                ? BluetoothUtils.getBtDrawableWithDescription(mContext, mCachedDevice).first

                : mContext.getDrawable(R.drawable.ic_headphone);

    }

    }





    @Override

    @Override

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/BluetoothMediaDeviceTest.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothProfile;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.BitmapDrawable;





import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -96,4 +97,17 @@ public class BluetoothMediaDeviceTest { 




        assertThat(mBluetoothMediaDevice.isFastPairDevice()).isFalse();

        assertThat(mBluetoothMediaDevice.isFastPairDevice()).isFalse();

    }

    }



    @Test

    public void getIcon_isNotFastPairDevice_drawableTypeIsNotBitmapDrawable() {

        final BluetoothDevice bluetoothDevice = mock(BluetoothDevice.class);

        when(mDevice.getDevice()).thenReturn(bluetoothDevice);



        final String value = "False";

        final byte[] bytes = value.getBytes();

        when(bluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))

                .thenReturn(bytes);



        assertThat(mBluetoothMediaDevice.getIcon() instanceof BitmapDrawable).isFalse();

    }

}
 
}