Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19f50e67 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

Log RemoteInputActive value for entry and all 

This CL adds remote input active value for both entry and for all remote inputs

Bug: 290068526
Test: Send notification with remote input with Notify and send remote input and get BR and check NotifRemoteInputLog in SystemUIAuxiliaryDumpService

Change-Id: I7ac05300e0a9344058662453642e7b84b2cecc8e
parent a06518bf

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -102,18 +102,21 @@ public class RemoteInputController { 
            mLogger.logRemoveRemoteInput(

            mLogger.logRemoveRemoteInput(

                    entry.getKey() /* entryKey*/,

                    entry.getKey() /* entryKey*/,

                    true /* remoteEditImeVisible */,

                    true /* remoteEditImeVisible */,

                    true /* remoteEditImeAnimatingAway */);

                    true /* remoteEditImeAnimatingAway */,

                    isRemoteInputActive(entry) /* isRemoteInputActiveForEntry */,

                    isRemoteInputActive() /* isRemoteInputActive */);

            return;

            return;

        }

        }

        // If the view is being removed, this may be called even though we're not active

        // 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(

        mLogger.logRemoveRemoteInput(

                entry.getKey() /* entryKey */,

                entry.getKey() /* entryKey */,

                entry.mRemoteEditImeVisible /* remoteEditImeVisible */,

                entry.mRemoteEditImeVisible /* remoteEditImeVisible */,

                entry.mRemoteEditImeAnimatingAway /* remoteEditImeAnimatingAway */,

                entry.mRemoteEditImeAnimatingAway /* remoteEditImeAnimatingAway */,

                remoteInputActive /* isRemoteInputActive */);

                remoteInputActiveForEntry /* isRemoteInputActiveForEntry */,

                isRemoteInputActive()/* isRemoteInputActive */);





        if (!remoteInputActive) return;

        if (!remoteInputActiveForEntry) return;





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

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

packages/SystemUI/src/com/android/systemui/statusbar/notification/RemoteInputControllerLogger.kt

+6 −3
Original line number Original line Diff line number Diff line
@@ -51,7 +51,8 @@ constructor(@NotificationRemoteInputLog private val logBuffer: LogBuffer) { 
        entryKey: String,

        entryKey: String,

        remoteEditImeVisible: Boolean,

        remoteEditImeVisible: Boolean,

        remoteEditImeAnimatingAway: Boolean,

        remoteEditImeAnimatingAway: Boolean,

        isRemoteInputActive: Boolean? = null

        isRemoteInputActiveForEntry: Boolean,

        isRemoteInputActive: Boolean

    ) =

    ) =

        logBuffer.log(

        logBuffer.log(

            TAG,

            TAG,
@@ -60,11 +61,13 @@ constructor(@NotificationRemoteInputLog private val logBuffer: LogBuffer) { 
                str1 = entryKey

                str1 = entryKey

                bool1 = remoteEditImeVisible

                bool1 = remoteEditImeVisible

                bool2 = remoteEditImeAnimatingAway

                bool2 = remoteEditImeAnimatingAway

                str2 = isRemoteInputActive?.toString() ?: "N/A"

                bool3 = isRemoteInputActiveForEntry

                bool4 = isRemoteInputActive

            },

            },

            {

            {

                "removeRemoteInput entry: $str1, remoteEditImeVisible: $bool1" +

                "removeRemoteInput entry: $str1, remoteEditImeVisible: $bool1" +

                    ", remoteEditImeAnimatingAway: $bool2, isActive: $str2"

                    ", remoteEditImeAnimatingAway: $bool2, isRemoteInputActiveForEntry: $bool3" +

                    ", isRemoteInputActive: $bool4"

            }

            }

        )

        )