commit e426dac4e2e668ff6af027ec0c8bbfff40596ba1
author Charles He <qiurui@google.com> Thu Dec 29 10:43:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 29 10:43:40 2016 +0000
tree be53eac0bd2feda9249ccc097969e82dec89e7cc
parent c189f23dd4853fe490ce82adc485f8986f5bbb68
parent 3cc7f6acdcd7b81fcb6e3bfbe821a90be844bdc0

Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c
am: 3cc7f6acdc

Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d

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 a989a17..1a6193d 100644
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -32,6 +32,7 @@
 import android.util.Slog;
 
 import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;
 
 import libcore.io.IoUtils;
 
@@ -83,6 +84,8 @@
 
     private int mAllowedUid = -1;
     private long mBlockDeviceSize;
+
+    @GuardedBy("mLock")
     private boolean mIsWritable = true;
 
     public PersistentDataBlockService(Context context) {