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

Commit b35c6270 authored by Iván Budnik's avatar Iván Budnik
Browse files

Cleanup and simplify MediaDevice-related classes 

This is a non-functional change.

Bug: 205124386
Flag: EXEMPT refactor
Test: atest com.android.settingslib.media
Change-Id: Ia0091229af82404a1c795bd5cb89de009a62c827
parent 5d387433

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

+7 −12
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ package com.android.settingslib.media; 




import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;

import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothHearingAid;
@@ -37,21 +39,14 @@ public class BluetoothMediaDevice extends MediaDevice { 




    private static final String TAG = "BluetoothMediaDevice";

    private static final String TAG = "BluetoothMediaDevice";





    private CachedBluetoothDevice mCachedDevice;

    private final CachedBluetoothDevice mCachedDevice;

    private final AudioManager mAudioManager;

    private final AudioManager mAudioManager;





    BluetoothMediaDevice(

    BluetoothMediaDevice(

            Context context,

            @NonNull Context context,

            CachedBluetoothDevice device,

            @NonNull CachedBluetoothDevice device,

            MediaRoute2Info info) {

            @Nullable MediaRoute2Info info,

        this(context, device, info, null);

            @Nullable RouteListingPreference.Item item) {

    }



    BluetoothMediaDevice(

            Context context,

            CachedBluetoothDevice device,

            MediaRoute2Info info,

            RouteListingPreference.Item item) {

        super(context, info, item);

        super(context, info, item);

        mCachedDevice = device;

        mCachedDevice = device;

        mAudioManager = context.getSystemService(AudioManager.class);

        mAudioManager = context.getSystemService(AudioManager.class);

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.settingslib.media;

package com.android.settingslib.media;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2Info;
@@ -32,9 +34,9 @@ public class ComplexMediaDevice extends MediaDevice { 
    private final String mSummary = "";

    private final String mSummary = "";





    ComplexMediaDevice(

    ComplexMediaDevice(

            Context context,

            @NonNull Context context,

            MediaRoute2Info info,

            @NonNull MediaRoute2Info info,

            RouteListingPreference.Item item) {

            @Nullable RouteListingPreference.Item item) {

        super(context, info, item);

        super(context, info, item);

    }

    }

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

+5 −7
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET; 
import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET_DOCKED;

import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET_DOCKED;

import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;

import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2Info;
@@ -43,17 +45,13 @@ public class InfoMediaDevice extends MediaDevice { 
    private static final String TAG = "InfoMediaDevice";

    private static final String TAG = "InfoMediaDevice";





    InfoMediaDevice(

    InfoMediaDevice(

            Context context,

            @NonNull Context context,

            MediaRoute2Info info,

            @NonNull MediaRoute2Info info,

            RouteListingPreference.Item item) {

            @Nullable RouteListingPreference.Item item) {

        super(context, info, item);

        super(context, info, item);

        initDeviceRecord();

        initDeviceRecord();

    }

    }





    InfoMediaDevice(Context context, MediaRoute2Info info) {

        this(context, info, null);

    }



    @Override

    @Override

    public String getName() {

    public String getName() {

        return mRouteInfo.getName().toString();

        return mRouteInfo.getName().toString();

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -570,7 +570,7 @@ public class LocalMediaManager implements BluetoothCallback { 
                final CachedBluetoothDevice cachedDevice =

                final CachedBluetoothDevice cachedDevice =

                        cachedDeviceManager.findDevice(device);

                        cachedDeviceManager.findDevice(device);

                if (isBondedMediaDevice(cachedDevice) && isMutingExpectedDevice(cachedDevice)) {

                if (isBondedMediaDevice(cachedDevice) && isMutingExpectedDevice(cachedDevice)) {

                    return new BluetoothMediaDevice(mContext, cachedDevice, null);

                    return new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);

                }

                }

            }

            }

            return null;

            return null;
@@ -617,7 +617,7 @@ public class LocalMediaManager implements BluetoothCallback { 
            mDisconnectedMediaDevices.clear();

            mDisconnectedMediaDevices.clear();

            for (CachedBluetoothDevice cachedDevice : cachedBluetoothDeviceList) {

            for (CachedBluetoothDevice cachedDevice : cachedBluetoothDeviceList) {

                final MediaDevice mediaDevice =

                final MediaDevice mediaDevice =

                        new BluetoothMediaDevice(mContext, cachedDevice, null);

                        new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);

                if (!mMediaDevices.contains(mediaDevice)) {

                if (!mMediaDevices.contains(mediaDevice)) {

                    cachedDevice.registerCallback(mDeviceAttributeChangeCallback);

                    cachedDevice.registerCallback(mDeviceAttributeChangeCallback);

                    mDisconnectedMediaDevices.add(mediaDevice);

                    mDisconnectedMediaDevices.add(mediaDevice);

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -49,6 +49,8 @@ import static android.media.RouteListingPreference.Item.SUBTEXT_UNAUTHORIZED; 
import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED;

import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED;

import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;

import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;
@@ -123,9 +125,9 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { 
    protected final RouteListingPreference.Item mItem;

    protected final RouteListingPreference.Item mItem;





    MediaDevice(

    MediaDevice(

            Context context,

            @NonNull Context context,

            MediaRoute2Info info,

            @Nullable MediaRoute2Info info,

            RouteListingPreference.Item item) {

            @Nullable RouteListingPreference.Item item) {

        mContext = context;

        mContext = context;

        mRouteInfo = info;

        mRouteInfo = info;

        mItem = item;

        mItem = item;