Merge "Remove media_controls_lockscreen_shade_bug_fix flag" into main (8f71471c) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1356,16 +1356,6 @@ flag {
		}
		}

		flag {
		name: "media_controls_lockscreen_shade_bug_fix"
		namespace: "systemui"
		description: "Use ShadeInteractor for media location changes"
		bug: "319244625"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "media_controls_button_media3"
		namespace: "systemui"

+5 −8

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.app.tracing.traceSection
		import com.android.keyguard.KeyguardViewController
		import com.android.systemui.Dumpable
		import com.android.systemui.Flags.mediaControlsLockscreenShadeBugFix
		import com.android.systemui.communal.ui.viewmodel.CommunalTransitionViewModel
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		@@ -608,7 +607,6 @@ constructor(
		}
		}

		if (mediaControlsLockscreenShadeBugFix()) {
		coroutineScope.launch {
		shadeInteractor.shadeExpansion.collect { expansion ->
		if (expansion >= 1f \|\| expansion <= 0f) {
		@@ -617,7 +615,6 @@ constructor(
		}
		}
		}
		}

		val settingsObserver: ContentObserver =
		object : ContentObserver(handler) {