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

Commit 187ef8cd authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Rename AudioPoliciesDeviceRC to AudioManagerRC" into main

parents 3b74b48c 9b835888

services/core/java/com/android/server/media/AudioPoliciesDeviceRouteController.java→services/core/java/com/android/server/media/AudioManagerRouteController.java

+3 −5
Original line number Diff line number Diff line
@@ -58,11 +58,9 @@ import java.util.Objects; 
 * <p>This implementation obtains and manages all routes via {@link AudioManager}, with the

 * exception of {@link AudioManager#handleBluetoothActiveDeviceChanged inactive bluetooth} routes

 * which are managed by {@link AudioPoliciesBluetoothRouteController}, which depends on the

 * bluetooth stack (for example {@link BluetoothAdapter}.

 * bluetooth stack ({@link BluetoothAdapter} and related classes).

 */

// TODO: b/305199571 - Rename this class to avoid the AudioPolicies prefix, which has been flagged

// by the audio team as a confusing name.

/* package */ final class AudioPoliciesDeviceRouteController implements DeviceRouteController {

/* package */ final class AudioManagerRouteController implements DeviceRouteController {

    private static final String TAG = SystemMediaRoute2Provider.TAG;



    @NonNull
@@ -103,7 +101,7 @@ import java.util.Objects; 
                Manifest.permission.MODIFY_AUDIO_ROUTING,

                Manifest.permission.QUERY_AUDIO_STATE

            })

    /* package */ AudioPoliciesDeviceRouteController(

    /* package */ AudioManagerRouteController(

            @NonNull Context context,

            @NonNull AudioManager audioManager,

            @NonNull Looper looper,

services/core/java/com/android/server/media/DeviceRouteController.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ import java.util.List; 
        if (strategyForMedia != null

                && btAdapter != null

                && Flags.enableAudioPoliciesDeviceAndBluetoothController()) {

            return new AudioPoliciesDeviceRouteController(

            return new AudioManagerRouteController(

                    context,

                    audioManager,

                    looper,

services/tests/media/mediarouterservicetest/src/com/android/server/media/AudioPoliciesDeviceRouteControllerTest.java→services/tests/media/mediarouterservicetest/src/com/android/server/media/AudioManagerRouteControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import java.util.List; 
import java.util.Set;



@RunWith(JUnit4.class)

public class AudioPoliciesDeviceRouteControllerTest {

public class AudioManagerRouteControllerTest {



    private static final String FAKE_ROUTE_NAME = "fake name";

    private static final AudioDeviceInfo FAKE_AUDIO_DEVICE_INFO_BUILTIN_SPEAKER =
@@ -89,7 +89,7 @@ public class AudioPoliciesDeviceRouteControllerTest { 
    private Set<AudioDeviceInfo> mAvailableAudioDeviceInfos;

    @Mock private AudioManager mMockAudioManager;

    @Mock private DeviceRouteController.OnDeviceRouteChangedListener mOnDeviceRouteChangedListener;

    private AudioPoliciesDeviceRouteController mControllerUnderTest;

    private AudioManagerRouteController mControllerUnderTest;

    private AudioDeviceCallback mAudioDeviceCallback;

    private AudioProductStrategy mMediaAudioProductStrategy;
@@ -116,7 +116,7 @@ public class AudioPoliciesDeviceRouteControllerTest { 
        BluetoothAdapter btAdapter =

                realContext.getSystemService(BluetoothManager.class).getAdapter();

        mControllerUnderTest =

                new AudioPoliciesDeviceRouteController(

                new AudioManagerRouteController(

                        mockContext,

                        mMockAudioManager,

                        Looper.getMainLooper(),

services/tests/servicestests/src/com/android/server/media/DeviceRouteControllerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ public class DeviceRouteControllerTest { 
                DeviceRouteController.createInstance(

                        mContext, Looper.getMainLooper(), mOnDeviceRouteChangedListener);



        Truth.assertThat(deviceRouteController)

                .isInstanceOf(AudioPoliciesDeviceRouteController.class);

        Truth.assertThat(deviceRouteController).isInstanceOf(AudioManagerRouteController.class);

    }

}