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

Commit da1807fc authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I236092a3 

* changes:
  Fixes crash in HierarchyViewer when windows hash code exceed int capacity. Bug: 2321018
parents 3f6f6807 236092a3

core/java/android/view/ViewDebug.java

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ public class ViewDebug { 
        if (parameter.indexOf('@') != -1) {

            final String[] ids = parameter.split("@");

            final String className = ids[0];

            final int hashCode = Integer.parseInt(ids[1], 16);

            final int hashCode = (int) Long.parseLong(ids[1], 16);



            View view = root.getRootView();

            if (view instanceof ViewGroup) {

services/java/com/android/server/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -4642,7 +4642,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                index = parameters.length();

            }

            final String code = parameters.substring(0, index);

            int hashCode = "ffffffff".equals(code) ? -1 : Integer.parseInt(code, 16);

            int hashCode = (int) Long.parseLong(code, 16);



            // Extract the command's parameter after the window description

            if (index < parameters.length()) {