Merge "Log RemoteInputActive value for entry and all" into main
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java
index ac80010..d5e4902 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java
@@ -102,18 +102,21 @@
mLogger.logRemoveRemoteInput(
entry.getKey() /* entryKey*/,
true /* remoteEditImeVisible */,
- true /* remoteEditImeAnimatingAway */);
+ true /* remoteEditImeAnimatingAway */,
+ isRemoteInputActive(entry) /* isRemoteInputActiveForEntry */,
+ isRemoteInputActive() /* isRemoteInputActive */);
return;
}
// If the view is being removed, this may be called even though we're not active
- boolean remoteInputActive = isRemoteInputActive(entry);
+ boolean remoteInputActiveForEntry = isRemoteInputActive(entry);
mLogger.logRemoveRemoteInput(
- entry.getKey() /* entryKey*/,
+ entry.getKey() /* entryKey */,
entry.mRemoteEditImeVisible /* remoteEditImeVisible */,
entry.mRemoteEditImeAnimatingAway /* remoteEditImeAnimatingAway */,
- remoteInputActive /* isRemoteInputActive */);
+ remoteInputActiveForEntry /* isRemoteInputActiveForEntry */,
+ isRemoteInputActive()/* isRemoteInputActive */);
- if (!remoteInputActive) return;
+ if (!remoteInputActiveForEntry) return;
pruneWeakThenRemoveAndContains(null /* contains */, entry /* remove */, token);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt
index 7809eaa..39b999c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt
@@ -51,7 +51,8 @@
entryKey: String,
remoteEditImeVisible: Boolean,
remoteEditImeAnimatingAway: Boolean,
- isRemoteInputActive: Boolean? = null
+ isRemoteInputActiveForEntry: Boolean,
+ isRemoteInputActive: Boolean
) =
logBuffer.log(
TAG,
@@ -60,11 +61,13 @@
str1 = entryKey
bool1 = remoteEditImeVisible
bool2 = remoteEditImeAnimatingAway
- str2 = isRemoteInputActive?.toString() ?: "N/A"
+ bool3 = isRemoteInputActiveForEntry
+ bool4 = isRemoteInputActive
},
{
"removeRemoteInput entry: $str1, remoteEditImeVisible: $bool1" +
- ", remoteEditImeAnimatingAway: $bool2, isActive: $str2"
+ ", remoteEditImeAnimatingAway: $bool2, isRemoteInputActiveForEntry: $bool3" +
+ ", isRemoteInputActive: $bool4"
}
)