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

Commit 652ef2a4 authored by Winson Chung's avatar Winson Chung
Browse files

Fix drag flag logs 

- The util method was previously only printing the first matching flag

Flag: EXEMPT bugfix
Bug: 375083991
Test: N/a
Change-Id: I0aac84efc4008dfe18df1c389c0b85da154f7242
parent ad55730b

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragUtils.java

+20 −10
Original line number Diff line number Diff line
@@ -125,25 +125,35 @@ public class DragUtils { 
        StringJoiner str = new StringJoiner("|");

        if ((dragFlags & DRAG_FLAG_GLOBAL) != 0) {

            str.add("GLOBAL");

        } else if ((dragFlags & DRAG_FLAG_GLOBAL_URI_READ) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_GLOBAL_URI_READ) != 0) {

            str.add("GLOBAL_URI_READ");

        } else if ((dragFlags & DRAG_FLAG_GLOBAL_URI_WRITE) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_GLOBAL_URI_WRITE) != 0) {

            str.add("GLOBAL_URI_WRITE");

        } else if ((dragFlags & DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION) != 0) {

            str.add("GLOBAL_PERSISTABLE_URI_PERMISSION");

        } else if ((dragFlags & DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION) != 0) {

            str.add("GLOBAL_PREFIX_URI_PERMISSION");

        } else if ((dragFlags & DRAG_FLAG_OPAQUE) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_OPAQUE) != 0) {

            str.add("OPAQUE");

        } else if ((dragFlags & DRAG_FLAG_ACCESSIBILITY_ACTION) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_ACCESSIBILITY_ACTION) != 0) {

            str.add("ACCESSIBILITY_ACTION");

        } else if ((dragFlags & DRAG_FLAG_REQUEST_SURFACE_FOR_RETURN_ANIMATION) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_REQUEST_SURFACE_FOR_RETURN_ANIMATION) != 0) {

            str.add("REQUEST_SURFACE_FOR_RETURN_ANIMATION");

        } else if ((dragFlags & DRAG_FLAG_GLOBAL_SAME_APPLICATION) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_GLOBAL_SAME_APPLICATION) != 0) {

            str.add("GLOBAL_SAME_APPLICATION");

        } else if ((dragFlags & DRAG_FLAG_START_INTENT_SENDER_ON_UNHANDLED_DRAG) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_START_INTENT_SENDER_ON_UNHANDLED_DRAG) != 0) {

            str.add("START_INTENT_SENDER_ON_UNHANDLED_DRAG");

        } else if ((dragFlags & DRAG_FLAG_HIDE_CALLING_TASK_ON_DRAG_START) != 0) {

        }

        if ((dragFlags & DRAG_FLAG_HIDE_CALLING_TASK_ON_DRAG_START) != 0) {

            str.add("HIDE_CALLING_TASK_ON_DRAG_START");

        }

        return str.toString();

services/core/java/com/android/server/wm/DragDropController.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ class DragDropController { 
            SurfaceControl surface, int touchSource, int touchDeviceId, int touchPointerId,

            float touchX, float touchY, float thumbCenterX, float thumbCenterY, ClipData data) {

        if (DEBUG_DRAG) {

            Slog.d(TAG_WM, "perform drag: win=" + window + " surface=" + surface + " flags=" +

            Slog.d(TAG_WM, "perform drag: win=" + window + " surface=" + surface + " flags=0x" +

                    Integer.toHexString(flags) + " data=" + data + " touch(" + touchX + ","

                    + touchY + ") thumb center(" + thumbCenterX + "," + thumbCenterY + ")");

        }