summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Hansen <markhansen@google.com> 2023-09-06 04:02:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 04:02:44 +0000
commit8558583bb2b38ad3e5daac55963ffa2956e81cac (patch)
tree9792e9eb614ebb237a0f673e6b4a0030db3755f4
parentdcd507d1c4ac8158e197d3a80e21dbedba6a9810 (diff)
parentd20edb139d13707e508876cc0df7d2e2f677fa9e (diff)
Merge "Dispatch from DecorView to View.toString()" into main am: 9bf0ec58f1 am: 17d66bb4ee am: 67fba7fab6 am: d20edb139d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2739113 Change-Id: I44bf02e334be60b42165b64b0b671a225b963982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/com/android/internal/policy/DecorView.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 86ca077d77d9..3e16df4d7f67 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -2624,8 +2624,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
@Override
public String toString() {
- return "DecorView@" + Integer.toHexString(this.hashCode()) + "["
- + getTitleSuffix(mWindow.getAttributes()) + "]";
+ return super.toString() + "[" + getTitleSuffix(mWindow.getAttributes()) + "]";
}
private static class ColorViewState {