commit 00f9a1a4735f8ba6b40cee5294a034bd60b28df4
author Charles He <qiurui@google.com> Mon Dec 12 13:30:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 12 13:30:41 2016 +0000
tree b3312cf63970cf2cd6bb669b495b3b9d4159089c
parent 71fc5791fd1b669f03dabdd42bc540380d81c3a9
parent f6f1d627483b4dad9d65176769a1ee92c59a4810

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

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

diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java
index 73aca65..8a0d4df 100644
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -31,6 +31,7 @@
 import android.util.Slog;
 
 import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;
 
 import libcore.io.IoUtils;
 
@@ -85,6 +86,8 @@
 
     private int mAllowedUid = -1;
     private long mBlockDeviceSize;
+
+    @GuardedBy("mLock")
     private boolean mIsWritable = true;
 
     public PersistentDataBlockService(Context context) {