Merge "Fix thread safety issues;" am: a1431a8227 am: 3b65b029c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I6bf7d4ee71d9d6a409179e440f33fc0596d84897
This commit is contained in:
Chris Li
2021-08-12 23:38:47 +00:00
committed by Automerger Merge Worker

View File

@@ -44,8 +44,8 @@ class DisplayFoldDurationLogger {
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface ScreenState {} public @interface ScreenState {}
private @ScreenState int mScreenState = SCREEN_STATE_UNKNOWN; private volatile @ScreenState int mScreenState = SCREEN_STATE_UNKNOWN;
private Long mLastChanged = null; private volatile Long mLastChanged = null;
private static final int LOG_SUBTYPE_UNFOLDED = 0; private static final int LOG_SUBTYPE_UNFOLDED = 0;
private static final int LOG_SUBTYPE_FOLDED = 1; private static final int LOG_SUBTYPE_FOLDED = 1;