Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update device type of MediaDevice" into rvc-dev am: 3ad2ce635c

Browse Source 
Change-Id: Ic87e2dd4b5098c479c8f515f65fe992452cc6f5e
This commit is contained in:
Automerger Merge Worker
2020-02-27 04:08:25 +00:00
parent a44be1c266 3ad2ce635c
commit 91ad3fabc7
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -15,9 +15,15 @@
*/
package com.android.settingslib.media;
import static android.media.MediaRoute2Info.DEVICE_TYPE_BLUETOOTH;
import static android.media.MediaRoute2Info.DEVICE_TYPE_REMOTE_TV;
import static android.media.MediaRoute2Info.DEVICE_TYPE_UNKNOWN;
import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP;
import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;
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.bluetooth.BluetoothAdapter;
@@ -309,27 +315,29 @@ public class InfoMediaManager extends MediaManager {
}
private void addMediaDevice(MediaRoute2Info route) {
final int deviceType = route.getDeviceType();
final int deviceType = route.getType();
MediaDevice mediaDevice = null;
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.
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,
mPackageName);
if (!TextUtils.isEmpty(mPackageName)
&& TextUtils.equals(route.getClientPackageName(), mPackageName)) {
mCurrentConnectedDevice = mediaDevice;
}
mediaDevice = new InfoMediaDevice(mContext, mRouterManager, route,
mPackageName);
if (!TextUtils.isEmpty(mPackageName)
&& TextUtils.equals(route.getClientPackageName(), mPackageName)) {
mCurrentConnectedDevice = mediaDevice;
}
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;
case DEVICE_TYPE_BLUETOOTH:
case TYPE_HEARING_AID:
case TYPE_BLUETOOTH_A2DP:
final BluetoothDevice device =
BluetoothAdapter.getDefaultAdapter().getRemoteDevice(route.getOriginalId());
final CachedBluetoothDevice cachedDevice =