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

Merge "Add audio policies classes to SystemMediaRoute2Provider" into udc-dev am: 2610029d56

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21780001

Change-Id: Ib1210b369a9c467de9cb64f116b7131d2dbcd6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dadukin
2023-03-07 13:08:13 +00:00
committed by Automerger Merge Worker
parent 8087aa1cd2 2610029d56
commit 401e3586b7
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/media/BluetoothRouteController.java
View File

@@ -53,7 +53,16 @@ import java.util.Objects;
return new NoOpBluetoothRouteController(); return new NoOpBluetoothRouteController();
} }
return new LegacyBluetoothRouteController(context, btAdapter, listener); MediaFeatureFlagManager flagManager = MediaFeatureFlagManager.getInstance();
boolean isUsingLegacyController = flagManager.getBoolean(
MediaFeatureFlagManager.FEATURE_AUDIO_STRATEGIES_IS_USING_LEGACY_CONTROLLER,
true);
if (isUsingLegacyController) {
return new LegacyBluetoothRouteController(context, btAdapter, listener);
} else {
return new AudioPoliciesBluetoothRouteController(context, btAdapter, listener);
}
} }
/** /**

20
services/core/java/com/android/server/media/DeviceRouteController.java
View File

@@ -44,10 +44,22 @@ import android.os.ServiceManager;
IAudioService audioService = IAudioService.Stub.asInterface( IAudioService audioService = IAudioService.Stub.asInterface(
ServiceManager.getService(Context.AUDIO_SERVICE)); ServiceManager.getService(Context.AUDIO_SERVICE));
return new LegacyDeviceRouteController(context, MediaFeatureFlagManager flagManager = MediaFeatureFlagManager.getInstance();
audioManager, boolean isUsingLegacyController = flagManager.getBoolean(
audioService, MediaFeatureFlagManager.FEATURE_AUDIO_STRATEGIES_IS_USING_LEGACY_CONTROLLER,
onDeviceRouteChangedListener); true);
if (isUsingLegacyController) {
return new LegacyDeviceRouteController(context,
audioManager,
audioService,
onDeviceRouteChangedListener);
} else {
return new AudioPoliciesDeviceRouteController(context,
audioManager,
audioService,
onDeviceRouteChangedListener);
}
} }
/** /**

6
services/core/java/com/android/server/media/MediaFeatureFlagManager.java
View File

@@ -32,7 +32,7 @@ import java.lang.annotation.Target;
private static final String NAMESPACE_MEDIA_BETTER_TOGETHER = "media_better_together"; private static final String NAMESPACE_MEDIA_BETTER_TOGETHER = "media_better_together";
@StringDef(prefix = "FEATURE_", value = { @StringDef(prefix = "FEATURE_", value = {
FEATURE_IS_USING_LEGACY_BLUETOOTH_CONTROLLER FEATURE_AUDIO_STRATEGIES_IS_USING_LEGACY_CONTROLLER
}) })
@Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER }) @Target({ ElementType.TYPE_USE, ElementType.TYPE_PARAMETER })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -43,7 +43,7 @@ import java.lang.annotation.Target;
* 'Audio Strategies'-aware controller. * 'Audio Strategies'-aware controller.
*/ */
/* package */ static final @MediaFeatureFlag String /* package */ static final @MediaFeatureFlag String
FEATURE_IS_USING_LEGACY_BLUETOOTH_CONTROLLER = FEATURE_AUDIO_STRATEGIES_IS_USING_LEGACY_CONTROLLER =
"BluetoothRouteController__enable_legacy_bluetooth_routes_controller"; "BluetoothRouteController__enable_legacy_bluetooth_routes_controller";
private static final MediaFeatureFlagManager sInstance = new MediaFeatureFlagManager(); private static final MediaFeatureFlagManager sInstance = new MediaFeatureFlagManager();
@@ -52,7 +52,7 @@ import java.lang.annotation.Target;
// Empty to prevent instantiation. // Empty to prevent instantiation.
} }
/* package */ MediaFeatureFlagManager getInstance() { /* package */ static MediaFeatureFlagManager getInstance() {
return sInstance; return sInstance;
} }