Merge "[Disable Flags Logging] Fix CollapsedStatusBarFragmentLogger to log new+newAfterLocalModification instead of old+new." into sc-v2-dev

packages/SystemUI/src/com/android/systemui/statusbar/DisableFlagsLogger.kt

@@ -85,24 +85,30 @@ class DisableFlagsLogger constructor(
      * is no difference. the new-after-modification state also won't be included if there's no
      * difference from the new state.
      *
-     * @param old the disable state that had been previously sent.
+     * @param old the disable state that had been previously sent. Null if we don't need to log the
+     *   previously sent state.
      * @param new the new disable state that has just been sent.
      * @param newAfterLocalModification the new disable states after a class has locally modified
      *   them. Null if the class does not locally modify.
      */
     fun getDisableFlagsString(
-        old: DisableState,
+        old: DisableState? = null,
         new: DisableState,
         newAfterLocalModification: DisableState? = null
     ): String {
         val builder = StringBuilder("Received new disable state. ")
+
+        old?.let {
             builder.append("Old: ")
             builder.append(getFlagsString(old))
-        builder.append(" | New: ")
+            builder.append(" | ")
-        if (old != new) {
+        }
+
+        builder.append("New: ")
+        if (old != null && old != new) {
             builder.append(getFlagsStringWithDiff(old, new))
         } else {
-            builder.append(getFlagsString(old))
+            builder.append(getFlagsString(new))
         }
 
         if (newAfterLocalModification != null && new != newAfterLocalModification) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java

@@ -253,8 +253,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
         state1 = adjustDisableFlags(state1);
 
         mCollapsedStatusBarFragmentLogger.logDisableFlagChange(
-                new DisableState(state1BeforeAdjustment, state2),
+                /* new= */ new DisableState(state1BeforeAdjustment, state2),
-                new DisableState(state1, state2));
+                /* newAfterLocalModification= */ new DisableState(state1, state2));
 
         final int old1 = mDisabled1;
         final int diff1 = state1 ^ old1;

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentLogger.kt

@@ -28,22 +28,31 @@ class CollapsedStatusBarFragmentLogger @Inject constructor(
         private val disableFlagsLogger: DisableFlagsLogger,
 ) {
 
-    /** Logs a string representing the old and new disable flag states to [buffer]. */
+    /**
+     * Logs a string representing the new state received by [CollapsedStatusBarFragment] and any
+     * modifications that were made to the flags locally.
+     *
+     * @param new see [DisableFlagsLogger.getDisableFlagsString]
+     * @param newAfterLocalModification see [DisableFlagsLogger.getDisableFlagsString]
+     */
     fun logDisableFlagChange(
-            oldState: DisableFlagsLogger.DisableState,
+        new: DisableFlagsLogger.DisableState,
-            newState: DisableFlagsLogger.DisableState) {
+        newAfterLocalModification: DisableFlagsLogger.DisableState
+    ) {
         buffer.log(
                 TAG,
                 LogLevel.INFO,
                 {
-                    int1 = oldState.disable1
+                    int1 = new.disable1
-                    int2 = oldState.disable2
+                    int2 = new.disable2
-                    long1 = newState.disable1.toLong()
+                    long1 = newAfterLocalModification.disable1.toLong()
-                    long2 = newState.disable2.toLong()
+                    long2 = newAfterLocalModification.disable2.toLong()
                 },
                 {
                     disableFlagsLogger.getDisableFlagsString(
-                            DisableFlagsLogger.DisableState(int1, int2),
+                        old = null,
+                        new = DisableFlagsLogger.DisableState(int1, int2),
+                        newAfterLocalModification =
                             DisableFlagsLogger.DisableState(long1.toInt(), long2.toInt())
                     )
                 }

packages/SystemUI/tests/src/com/android/systemui/statusbar/DisableFlagsLoggerTest.kt

@@ -85,6 +85,23 @@ class DisableFlagsLoggerTest : SysuiTestCase() {
         assertThat(result).contains("(.n)")
     }
 
+    @Test
+    fun getDisableFlagsString_nullOld_onlyNewStateLogged() {
+        val result = disableFlagsLogger.getDisableFlagsString(
+            old = null,
+            new = DisableFlagsLogger.DisableState(
+                0b001, // abC
+                0b01, // mN
+            ),
+        )
+
+        assertThat(result).doesNotContain("Old")
+        assertThat(result).contains("New: abC.mN")
+        // We have no state to diff on, so we shouldn't see any diff in parentheses
+        assertThat(result).doesNotContain("(")
+        assertThat(result).doesNotContain(")")
+    }
+
     @Test
     fun getDisableFlagsString_nullLocalModification_localModNotLogged() {
         val result = disableFlagsLogger.getDisableFlagsString(

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentLoggerTest.kt

@@ -40,7 +40,7 @@ class CollapsedStatusBarFragmentLoggerTest : SysuiTestCase() {
     private val logger = CollapsedStatusBarFragmentLogger(buffer, disableFlagsLogger)
 
     @Test
-    fun logToBuffer_bufferHasStates() {
+    fun logDisableFlagChange_bufferHasStates() {
         val state = DisableFlagsLogger.DisableState(0, 1)
 
         logger.logDisableFlagChange(state, state)
@@ -48,7 +48,9 @@ class CollapsedStatusBarFragmentLoggerTest : SysuiTestCase() {
         val stringWriter = StringWriter()
         buffer.dump(PrintWriter(stringWriter), tailLength = 0)
         val actualString = stringWriter.toString()
-        val expectedLogString = disableFlagsLogger.getDisableFlagsString(state, state)
+        val expectedLogString = disableFlagsLogger.getDisableFlagsString(
+            old = null, new = state, newAfterLocalModification = state
+        )
 
         assertThat(actualString).contains(expectedLogString)
     }