| commit | 63cabfe03ec0468438422fc860dca143b440e229 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Mar 01 12:37:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 01 12:37:44 2023 +0000 |
| tree | 1a655fa2f4377b3516600ec97b206ad772276123 | |
| parent | 7d34fb1a290fdaa0980ff4f1491f129f77a2c98a [diff] | |
| parent | 59bacd6287043c58bdbe1a1ad355423163f09779 [diff] |
Merge "Add more logging when view methods are called from the wrong thread" into tm-qpr-dev am: 7f20b9db07 am: 59bacd6287 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21553701 Change-Id: Ide4ca2ea7571edce1fae5f0d4910fb9643c2d667 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 2ff9ad3..71a3a7b 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java
@@ -10078,9 +10078,12 @@ } void checkThread() { - if (mThread != Thread.currentThread()) { + Thread current = Thread.currentThread(); + if (mThread != current) { throw new CalledFromWrongThreadException( - "Only the original thread that created a view hierarchy can touch its views."); + "Only the original thread that created a view hierarchy can touch its views." + + " Expected: " + mThread.getName() + + " Calling: " + current.getName()); } }