Merge "Log removeRemoteInput apply skip" into main (911f924d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -118,16 +118,27 @@ public class RemoteInputController {

		// If the view is being removed, this may be called even though we're not active
		boolean remoteInputActiveForEntry = isRemoteInputActive(entry);
		boolean remoteInputActive = isRemoteInputActive();
		mLogger.logRemoveRemoteInput(
		entry.getKey() /* entryKey */,
		entry.mRemoteEditImeVisible /* remoteEditImeVisible */,
		entry.mRemoteEditImeAnimatingAway /* remoteEditImeAnimatingAway */,
		remoteInputActiveForEntry /* isRemoteInputActiveForEntry */,
		isRemoteInputActive()/* isRemoteInputActive */,
		remoteInputActive/* isRemoteInputActive */,
		reason/* reason */,
		entry.getNotificationStyle()/* notificationStyle */);

		if (!remoteInputActiveForEntry) return;
		if (!remoteInputActiveForEntry) {
		if (mLastAppliedRemoteInputActive != null
		&& mLastAppliedRemoteInputActive
		&& !remoteInputActive) {
		mLogger.logRemoteInputApplySkipped(
		entry.getKey() /* entryKey */,
		reason/* reason */,
		entry.getNotificationStyle()/* notificationStyle */);
		}
		return;
		}

		pruneWeakThenRemoveAndContains(null /* contains /, entry / remove */, token);

+15 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,21 @@ constructor(@NotificationRemoteInputLog private val logBuffer: LogBuffer) {
		}
		)

		fun logRemoteInputApplySkipped(entryKey: String, reason: String, notificationStyle: String) =
		logBuffer.log(
		TAG,
		DEBUG,
		{
		str1 = entryKey
		str2 = reason
		str3 = notificationStyle
		},
		{
		"removeRemoteInput[apply is skipped] reason: $str2" +
		"for entry: $str1, style: $str3 "
		}
		)

		private companion object {
		private const val TAG = "RemoteInputControllerLog"
		}