diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 2fd974e0a79ba..923261609afea 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -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) {
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index d250e3c3d9773..e61cb94d18b48 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -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()) {