Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev

2016-12-29 09:43:10 +00:00
parent 4bd97eb888 71d2a41dd9
commit 63a27d773b
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -29,6 +29,7 @@ import android.service.persistentdata.IPersistentDataBlockService;
 import android.util.Slog;

 import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;

 import libcore.io.IoUtils;

@@ -76,6 +77,8 @@ public class PersistentDataBlockService extends SystemService {

    private int mAllowedUid = -1;
    private long mBlockDeviceSize;
+
+    @GuardedBy("mLock")
    private boolean mIsWritable = true;

    public PersistentDataBlockService(Context context) {