Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05dc5896 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix thread safety issues;" am: a1431a82 am: 3b65b029 am: c31e0521 am: e0b2ad80 

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

Change-Id: Iead9b6d2518e7b28b82e66ce9c07dcd236a051f4
parents 929cbfaa e0b2ad80

services/core/java/com/android/server/policy/DisplayFoldDurationLogger.java

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ class DisplayFoldDurationLogger { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface ScreenState {}



    private @ScreenState int mScreenState = SCREEN_STATE_UNKNOWN;

    private Long mLastChanged = null;

    private volatile @ScreenState int mScreenState = SCREEN_STATE_UNKNOWN;

    private volatile Long mLastChanged = null;



    private static final int LOG_SUBTYPE_UNFOLDED = 0;

    private static final int LOG_SUBTYPE_FOLDED = 1;