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

Commit 9fe0518f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update device type of MediaDevice" into rvc-dev am: 3ad2ce63 am: 91ad3fab 

Change-Id: Ib2160a603a7cc49cb4da637ee8aaf8417ebe6155
parents 9a1a082f 91ad3fab

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

+26 −18
Original line number Original line Diff line number Diff line
@@ -15,9 +15,15 @@ 
 */

 */

package com.android.settingslib.media;

package com.android.settingslib.media;





import static android.media.MediaRoute2Info.DEVICE_TYPE_BLUETOOTH;

import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP;

import static android.media.MediaRoute2Info.DEVICE_TYPE_REMOTE_TV;

import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;

import static android.media.MediaRoute2Info.DEVICE_TYPE_UNKNOWN;

import static android.media.MediaRoute2Info.TYPE_GROUP;

import static android.media.MediaRoute2Info.TYPE_HEARING_AID;

import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER;

import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;

import static android.media.MediaRoute2Info.TYPE_UNKNOWN;

import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;

import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;





import android.app.Notification;

import android.app.Notification;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;
@@ -309,27 +315,29 @@ public class InfoMediaManager extends MediaManager { 
    }

    }





    private void addMediaDevice(MediaRoute2Info route) {

    private void addMediaDevice(MediaRoute2Info route) {

        final int deviceType = route.getDeviceType();

        final int deviceType = route.getType();

        MediaDevice mediaDevice = null;

        MediaDevice mediaDevice = null;

        switch (deviceType) {

        switch (deviceType) {

            case DEVICE_TYPE_UNKNOWN:

            case TYPE_UNKNOWN:

            case TYPE_REMOTE_TV:

            case TYPE_REMOTE_SPEAKER:

            case TYPE_GROUP:

                //TODO(b/148765806): use correct device type once api is ready.

                //TODO(b/148765806): use correct device type once api is ready.

                final String defaultRoute = "DEFAULT_ROUTE";

                if (TextUtils.equals(defaultRoute, route.getOriginalId())) {

                    mediaDevice =

                            new PhoneMediaDevice(mContext, mRouterManager, route, mPackageName);

                } else {

                mediaDevice = new InfoMediaDevice(mContext, mRouterManager, route,

                mediaDevice = new InfoMediaDevice(mContext, mRouterManager, route,

                        mPackageName);

                        mPackageName);

                if (!TextUtils.isEmpty(mPackageName)

                if (!TextUtils.isEmpty(mPackageName)

                        && TextUtils.equals(route.getClientPackageName(), mPackageName)) {

                        && TextUtils.equals(route.getClientPackageName(), mPackageName)) {

                    mCurrentConnectedDevice = mediaDevice;

                    mCurrentConnectedDevice = mediaDevice;

                }

                }

                }

                break;

                break;

            case DEVICE_TYPE_REMOTE_TV:

            case TYPE_BUILTIN_SPEAKER:

            case TYPE_WIRED_HEADSET:

            case TYPE_WIRED_HEADPHONES:

                mediaDevice =

                        new PhoneMediaDevice(mContext, mRouterManager, route, mPackageName);

                break;

                break;

            case DEVICE_TYPE_BLUETOOTH:

            case TYPE_HEARING_AID:

            case TYPE_BLUETOOTH_A2DP:

                final BluetoothDevice device =

                final BluetoothDevice device =

                        BluetoothAdapter.getDefaultAdapter().getRemoteDevice(route.getOriginalId());

                        BluetoothAdapter.getDefaultAdapter().getRemoteDevice(route.getOriginalId());

                final CachedBluetoothDevice cachedDevice =

                final CachedBluetoothDevice cachedDevice =