From 39e6a8a17efd390af30e360fdccbe026e3bab306 Mon Sep 17 00:00:00 2001
From: Caitlin Shkuratov <caitlinshk@google.com>
Date: Wed, 14 Sep 2022 19:44:04 +0000
Subject: [PATCH] [Chipbar] Remove the media-specific wake reason from
 TemporaryViewDisplayController.

Bug: 245610654
Test: manual: Verified dozing log shows MEDIA_TRANSFER_INITIATED when we
display the media ttt view while dozing.
Test: media.taptotransfer tests
Test: TemporaryViewDisplayControllerTest

Change-Id: I07f68742e0b8d95c3deb18c90e9dbf89b47ca40f
---
 .../systemui/media/taptotransfer/common/MediaTttUtils.kt     | 1 +
 .../taptotransfer/receiver/MediaTttChipControllerReceiver.kt | 1 +
 .../taptotransfer/sender/MediaTttChipControllerSender.kt     | 1 +
 .../temporarydisplay/TemporaryViewDisplayController.kt       | 5 ++++-
 .../temporarydisplay/TemporaryViewDisplayControllerTest.kt   | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt
index 5db2cdc166e05..792ae7ca60491 100644
--- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt
@@ -29,6 +29,7 @@ class MediaTttUtils {
         // Used in CTS tests UpdateMediaTapToTransferSenderDisplayTest and
         // UpdateMediaTapToTransferReceiverDisplayTest
         const val WINDOW_TITLE = "Media Transfer Chip View"
+        const val WAKE_REASON = "MEDIA_TRANSFER_ACTIVATED"
 
         /**
          * Returns the information needed to display the icon.
diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt
index cdb3157c3b865..66f92d3fbd84f 100644
--- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt
@@ -72,6 +72,7 @@ class MediaTttChipControllerReceiver @Inject constructor(
         powerManager,
         R.layout.media_ttt_chip_receiver,
         MediaTttUtils.WINDOW_TITLE,
+        MediaTttUtils.WAKE_REASON,
 ) {
     @SuppressLint("WrongConstant") // We're allowed to use LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
     override val windowLayoutParams = commonWindowLayoutParams.apply {
diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt
index 57e2b509df74a..c535e6e1800a3 100644
--- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt
@@ -68,6 +68,7 @@ class MediaTttChipControllerSender @Inject constructor(
         powerManager,
         R.layout.media_ttt_chip,
         MediaTttUtils.WINDOW_TITLE,
+        MediaTttUtils.WAKE_REASON,
 ) {
     override val windowLayoutParams = commonWindowLayoutParams.apply {
         gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL)
diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt
index d9c77df05440a..069a46c00bd4c 100644
--- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt
+++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt
@@ -49,6 +49,8 @@ import com.android.systemui.util.concurrency.DelayableExecutor
  *
  * @property windowTitle the title to use for the window that displays the temporary view. Should be
  *   normally cased, like "Window Title".
+ * @property wakeReason a string used for logging if we needed to wake the screen in order to
+ *   display the temporary view. Should be screaming snake cased, like WAKE_REASON.
  */
 abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
     internal val context: Context,
@@ -60,6 +62,7 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
     private val powerManager: PowerManager,
     @LayoutRes private val viewLayoutRes: Int,
     private val windowTitle: String,
+    private val wakeReason: String,
 ) {
     /**
      * Window layout params that will be used as a starting point for the [windowLayoutParams] of
@@ -114,7 +117,7 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
                 powerManager.wakeUp(
                         SystemClock.uptimeMillis(),
                         PowerManager.WAKE_REASON_APPLICATION,
-                        "com.android.systemui:media_tap_to_transfer_activated"
+                        "com.android.systemui:$wakeReason",
                 )
             }
 
diff --git a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt
index fbc4fee4fc079..4dc479c3dc40d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt
@@ -232,6 +232,7 @@ class TemporaryViewDisplayControllerTest : SysuiTestCase() {
         powerManager,
         R.layout.media_ttt_chip,
         "Window Title",
+        "WAKE_REASON",
     ) {
         var mostRecentViewInfo: ViewInfo? = null