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

Commit bf9a3b4b authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.... 

Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41d am: d0339c6e am: 6aa436be am: 76ca2da7 am: 0cc02190 am: ced5ab19 am: 3cc7f6ac am: e426dac4 am: b75b0255 am: 3ad5df52 am: fdcec75c" into nyc-mr2-dev-plus-aosp
parents 78129e30 f2263e3a

services/core/java/com/android/server/PersistentDataBlockService.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.service.persistentdata.PersistentDataBlockManager; 
import android.util.Slog;



import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;



import libcore.io.IoUtils;
@@ -83,6 +84,8 @@ public class PersistentDataBlockService extends SystemService { 


    private int mAllowedUid = -1;

    private long mBlockDeviceSize;



    @GuardedBy("mLock")

    private boolean mIsWritable = true;



    public PersistentDataBlockService(Context context) {