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

Commit 5e31b1fe authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Make sure no handlers have id = 0" into udc-dev am: 78ad5e0d am: 5525ce03 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905959



Change-Id: I526ebf61d2641656e65a86eab050df865abd6818
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 380f75c3 5525ce03

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Tracer.java

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ public class Tracer implements ShellCommandHandler.ShellCommandActionHandler { 
        if (mHandlerIds.containsKey(handler)) {

            handlerId = mHandlerIds.get(handler);

        } else {

            handlerId = mHandlerIds.size();

            // + 1 to avoid 0 ids which can be confused with missing value when dumped to proto

            handlerId = mHandlerIds.size() + 1;

            mHandlerIds.put(handler, handlerId);

        }