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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-27 04:06:09 +00:00
committed by Android (Google) Code Review
parent 8e5e4e03a9 6283741df5
commit 3ad2ce635c
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 =