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

Commit 12415a30 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Propagate PiP param change on RemoteAction update 

We used to only check title/contentDescription/actionIntent of
RemoteAction for uniqueness and ignore the isEnable/shouldShowIcon.

Bug: 234679022
Test: Verify the isEnabled change updates PiP menu
Change-Id: I769507253594b016802b71368ac4a9036f2ad21f
parent 2c428366

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ public class PipUtils { 
    public static boolean remoteActionsMatch(RemoteAction action1, RemoteAction action2) {

        if (action1 == action2) return true;

        if (action1 == null || action2 == null) return false;

        return Objects.equals(action1.getTitle(), action2.getTitle())

        return action1.isEnabled() == action2.isEnabled()

                && action1.shouldShowIcon() == action2.shouldShowIcon()

                && Objects.equals(action1.getTitle(), action2.getTitle())

                && Objects.equals(action1.getContentDescription(), action2.getContentDescription())

                && Objects.equals(action1.getActionIntent(), action2.getActionIntent());

    }