Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iead9b6d2518e7b28b82e66ce9c07dcd236a051f4
This commit is contained in:
Chris Li
2021-08-13 03:12:57 +00:00
committed by Automerger Merge Worker
parent 929cbfaa88 e0b2ad8048
commit 05dc589646
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/policy/DisplayFoldDurationLogger.java
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;