summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2019-03-29 14:37:01 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-29 14:37:01 -0700
commit67793b0eec39baff2db676fa55265dd37877df54 (patch)
treee62690d07adeb91a851615d3c37e28d3707fda33
parent27da4d70d462c4d12be4a3cb90497fbd30395e5a (diff)
parentfdb8dfdadfab7e83acfa39e5a336f7a7273da903 (diff)
Merge "Add missing checkThread"
am: fdb8dfdadf Change-Id: Iabcd28a4c3fa659c92b392573158dd5025ed8c37
-rw-r--r--core/java/android/view/ViewRootImpl.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 3fe06f10c758..5a1089bbc2b4 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1256,6 +1256,7 @@ public final class ViewRootImpl implements ViewParent,
@Override
public void onDescendantInvalidated(@NonNull View child, @NonNull View descendant) {
+ checkThread();
if ((descendant.mPrivateFlags & PFLAG_DRAW_ANIMATION) != 0) {
mIsAnimating = true;
}