From 6fdce778bc558dc3025de1ec44f67a829228bed1 Mon Sep 17 00:00:00 2001 From: Michael Mikhail Date: Tue, 16 May 2023 19:02:30 +0000 Subject: [PATCH] Remove MEDIA_FALSING_PENALTY flag Fixes: 259445895 Test: atest BrightLineClassifierTest Test: atest MediaControlPanelTest Change-Id: Iccd12a5c65729becd8e2c8f48ca88a8bc22a6723 --- .../systemui/classifier/BrightLineFalsingManager.java | 3 +-- .../SystemUI/src/com/android/systemui/flags/Flags.kt | 2 -- .../systemui/media/controls/ui/MediaControlPanel.java | 10 ++-------- .../systemui/classifier/BrightLineClassifierTest.java | 1 - .../media/controls/ui/MediaControlPanelTest.kt | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java index 691017b220f82..b2bcb0554b0dd 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java @@ -232,8 +232,7 @@ public class BrightLineFalsingManager implements FalsingManager { // check for false tap if it is a seekbar interaction if (interactionType == MEDIA_SEEKBAR) { - localResult[0] &= isFalseTap(mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY) - ? FalsingManager.MODERATE_PENALTY : FalsingManager.LOW_PENALTY); + localResult[0] &= isFalseTap(FalsingManager.MODERATE_PENALTY); } logDebug("False Gesture (type: " + interactionType + "): " + localResult[0]); diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 05df31bf63b23..7c48c43814786 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -386,8 +386,6 @@ object Flags { // TODO(b/254513168): Tracking Bug @JvmField val UMO_SURFACE_RIPPLE = releasedFlag(907, "umo_surface_ripple") - @JvmField val MEDIA_FALSING_PENALTY = releasedFlag(908, "media_falsing_media") - // TODO(b/261734857): Tracking Bug @JvmField val UMO_TURBULENCE_NOISE = releasedFlag(909, "umo_turbulence_noise") diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java index 9eda7ae2586d0..e7177ddb45c0a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java @@ -628,10 +628,7 @@ public class MediaControlPanel { seamlessView.setContentDescription(deviceString); seamlessView.setOnClickListener( v -> { - if (mFalsingManager.isFalseTap( - mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY) - ? FalsingManager.MODERATE_PENALTY : - FalsingManager.LOW_PENALTY)) { + if (mFalsingManager.isFalseTap(FalsingManager.MODERATE_PENALTY)) { return; } @@ -1141,10 +1138,7 @@ public class MediaControlPanel { } else { button.setEnabled(true); button.setOnClickListener(v -> { - if (!mFalsingManager.isFalseTap( - mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY) - ? FalsingManager.MODERATE_PENALTY : - FalsingManager.LOW_PENALTY)) { + if (!mFalsingManager.isFalseTap(FalsingManager.MODERATE_PENALTY)) { mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId); logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT); action.run(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java index 4cb99a23a531d..6afbde09610ea 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java @@ -120,7 +120,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { gestureCompleteListenerCaptor.capture()); mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue(); - mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true); mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt index 68c33fb93fe6f..4feb0e7ea7cce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt @@ -230,7 +230,6 @@ public class MediaControlPanelTest : SysuiTestCase() { FakeFeatureFlags().apply { this.set(Flags.UMO_SURFACE_RIPPLE, false) this.set(Flags.UMO_TURBULENCE_NOISE, false) - this.set(Flags.MEDIA_FALSING_PENALTY, true) this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true) this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false) }