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

Commit 7c78aba6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up enable_fix_for_empty_system_routes_crash" into main

parents 2c2e04e6 09853ad3

media/java/android/media/flags/media_better_together.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -78,16 +78,6 @@ flag { 
    bug: "288580225"

}



flag {

    name: "enable_fix_for_empty_system_routes_crash"

    namespace: "media_better_together"

    description: "Fixes a bug causing SystemUI to crash due to an empty system routes list in the routing framework."

    bug: "357468728"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_fix_for_route_visibility"

    namespace: "media_better_together"

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

+1 −5
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ import android.os.UserHandle; 
import android.util.Slog;



import com.android.internal.R;

import com.android.media.flags.Flags;



import java.util.Collections;

import java.util.List;

import java.util.Objects;
@@ -135,9 +133,7 @@ import java.util.Objects; 


    @Override

    public synchronized List<MediaRoute2Info> getAvailableRoutes() {

        return Flags.enableFixForEmptySystemRoutesCrash()

                ? List.of(mDeviceRoute)

                : Collections.emptyList();

        return List.of(mDeviceRoute);

    }



    @Override

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

+0 −3
Original line number Diff line number Diff line
@@ -30,13 +30,11 @@ import android.media.AudioRoutesInfo; 
import android.media.IAudioRoutesObserver;

import android.media.MediaRoute2Info;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.text.TextUtils;



import com.android.internal.R;

import com.android.media.flags.Flags;

import com.android.server.audio.AudioService;



import org.junit.Before;
@@ -148,7 +146,6 @@ public class LegacyDeviceRouteControllerTest { 
            assertThat(actualMediaRoute.getVolume()).isEqualTo(VOLUME_DEFAULT_VALUE);

        }



        @RequiresFlagsEnabled(Flags.FLAG_ENABLE_FIX_FOR_EMPTY_SYSTEM_ROUTES_CRASH)

        @Test

        public void getAvailableRoutes_matchesSelectedRoute() {

            when(mResources.getText(R.string.default_audio_route_name))