Merge "Remove obsolete flag" into udc-dev (83d16ecd) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -523,11 +523,6 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String DEFAULT_QR_CODE_SCANNER = "default_qr_code_scanner";

		/**
		* (boolean) Whether the task manager entrypoint is enabled.
		*/
		public static final String TASK_MANAGER_ENABLED = "task_manager_enabled";

		/**
		* (boolean) Whether the task manager should show an attention grabbing dot when tasks changed.
		*/

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import androidx.annotation.VisibleForTesting
		import androidx.recyclerview.widget.DiffUtil
		import androidx.recyclerview.widget.LinearLayoutManager
		import androidx.recyclerview.widget.RecyclerView
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_FOOTER_DOT
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS
		@@ -80,8 +79,6 @@ import kotlinx.coroutines.flow.asStateFlow

		/** A controller for the dealing with services running in the foreground. */
		interface FgsManagerController {
		/** Whether the TaskManager (and therefore this controller) is actually available. */
		val isAvailable: StateFlow<Boolean>

		/** The number of packages with a service running in the foreground. */
		val numRunningPackages: Int
		@@ -155,7 +152,6 @@ class FgsManagerControllerImpl @Inject constructor(

		companion object {
		private const val INTERACTION_JANK_TAG = "active_background_apps"
		private const val DEFAULT_TASK_MANAGER_ENABLED = true
		private const val DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT = false
		private const val DEFAULT_TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS = true
		private const val DEFAULT_TASK_MANAGER_SHOW_USER_VISIBLE_JOBS = true
		@@ -165,9 +161,6 @@ class FgsManagerControllerImpl @Inject constructor(
		override var newChangesSinceDialogWasDismissed = false
		private set

		val _isAvailable = MutableStateFlow(false)
		override val isAvailable: StateFlow<Boolean> = _isAvailable.asStateFlow()

		val _showFooterDot = MutableStateFlow(false)
		override val showFooterDot: StateFlow<Boolean> = _showFooterDot.asStateFlow()

		@@ -264,7 +257,6 @@ class FgsManagerControllerImpl @Inject constructor(
		NAMESPACE_SYSTEMUI,
		backgroundExecutor
		) {
		_isAvailable.value = it.getBoolean(TASK_MANAGER_ENABLED, _isAvailable.value)
		_showFooterDot.value =
		it.getBoolean(TASK_MANAGER_SHOW_FOOTER_DOT, _showFooterDot.value)
		showStopBtnForUserAllowlistedApps = it.getBoolean(
		@@ -280,11 +272,6 @@ class FgsManagerControllerImpl @Inject constructor(
		TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS,
		informJobSchedulerOfPendingAppStop)
		}

		_isAvailable.value = deviceConfigProxy.getBoolean(
		NAMESPACE_SYSTEMUI,
		TASK_MANAGER_ENABLED, DEFAULT_TASK_MANAGER_ENABLED
		)
		_showFooterDot.value = deviceConfigProxy.getBoolean(
		NAMESPACE_SYSTEMUI,
		TASK_MANAGER_SHOW_FOOTER_DOT, DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT

packages/SystemUI/src/com/android/systemui/qs/footer/data/repository/ForegroundServicesRepository.kt

+9 −19

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import kotlinx.coroutines.flow.merge
		interface ForegroundServicesRepository {
		/**
		* The number of packages with a service running in the foreground.
		*
		* Note that this will be equal to 0 if [FgsManagerController.isAvailable] is false.
		*/
		val foregroundServicesCount: Flow<Int>

		@@ -52,13 +50,7 @@ constructor(
		fgsManagerController: FgsManagerController,
		) : ForegroundServicesRepository {
		override val foregroundServicesCount: Flow<Int> =
		fgsManagerController.isAvailable
		.flatMapLatest { isAvailable ->
		if (!isAvailable) {
		return@flatMapLatest flowOf(0)
		}

		conflatedCallbackFlow {
		conflatedCallbackFlow<Int> {
		fun updateState(numberOfPackages: Int) {
		trySendWithFailureLogging(numberOfPackages, TAG)
		}
		@@ -75,9 +67,7 @@ constructor(
		awaitClose {
		fgsManagerController.removeOnNumberOfPackagesChangedListener(listener)
		}
		}
		}
		.distinctUntilChanged()
		}.distinctUntilChanged()

		override val hasNewChanges: Flow<Boolean> =
		fgsManagerController.showFooterDot.flatMapLatest { showFooterDot ->

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -111,8 +111,6 @@ public class FgsManagerControllerTest extends SysuiTestCase {
		MockitoAnnotations.initMocks(this);

		mDeviceConfigProxyFake = new DeviceConfigProxyFake();
		mDeviceConfigProxyFake.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED, "true", false);
		mSystemClock = new FakeSystemClock();
		mMainExecutor = new FakeExecutor(mSystemClock);
		mBackgroundExecutor = new FakeExecutor(mSystemClock);

packages/SystemUI/tests/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModelTest.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,6 @@ class FooterActionsViewModelTest : SysuiTestCase() {
		val securityController = FakeSecurityController()
		val fgsManagerController =
		FakeFgsManagerController(
		isAvailable = true,
		showFooterDot = false,
		numRunningPackages = 0,
		)