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

Commit 779780d4 authored by Jiyong Park's avatar Jiyong Park
Browse files

Flag removal: stoppable_fgs_system_app 

Bug: 409611954
Flag: EXEMPT flag removal
Test: N/A
Change-Id: I7ab89dd5d1db84ecde5199c9623b5a53c445da2d
parent 446638ae

packages/SystemUI/aconfig/systemui.aconfig

+1 −11
Original line number Diff line number Diff line
@@ -1912,16 +1912,6 @@ flag { 
      }

}



flag {

    name: "stoppable_fgs_system_app"

    namespace: "systemui"

    description: "System app with foreground service can opt in to be stoppable."

    bug: "376564917"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "keyguard_transition_force_finish_on_screen_off"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/FgsManagerControllerTest.java

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.content.pm.UserInfo; 
import android.os.Binder;

import android.os.RemoteException;

import android.os.UserHandle;

import android.platform.test.annotations.EnableFlags;

import android.provider.DeviceConfig;

import android.testing.TestableLooper;
@@ -50,7 +49,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;



import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogTransitionAnimator;

import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -320,7 +318,6 @@ public class FgsManagerControllerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_STOPPABLE_FGS_SYSTEM_APP)

    public void testButtonVisibilityOfStoppableApps() throws Exception {

        setUserProfiles(0);

        setBackgroundRestrictionExemptionReason("pkg", 12345, REASON_ALLOWLISTED_PACKAGE);

packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt

+2 −5
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ 
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_USER_VISIBLE_JOBS

import com.android.internal.jank.InteractionJankMonitor

import com.android.systemui.Dumpable

import com.android.systemui.Flags

import com.android.systemui.animation.DialogCuj

import com.android.systemui.animation.DialogTransitionAnimator

import com.android.systemui.animation.Expandable
@@ -753,11 +752,9 @@ constructor( 
                }

            // If the app wants to be a good citizen by being stoppable, even if the category it

            // belongs to is exempted for background restriction, let it be stoppable by user.

            if (Flags.stoppableFgsSystemApp()) {

            if (isStoppableApp(packageName)) {

                uiControl = UIControl.NORMAL

            }

            }



            uiControlInitialized = true

        }