Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...

am: fce4eb6810

Change-Id: I87a2d4fbeed47094cc27967b13e1950b3dedaf0e

diff --cc services/core/java/com/android/server/PersistentDataBlockService.java
index 8a0d4df,a989a17..ff84220
--- 1/services/core/java/com/android/server/PersistentDataBlockService.java
--- 2/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@@ -86,10 -83,8 +86,11 @@@ public class PersistentDataBlockServic
  
      private int mAllowedUid = -1;
      private long mBlockDeviceSize;
+     private boolean mIsWritable = true;
  
 +    @GuardedBy("mLock")
 +    private boolean mIsWritable = true;
 +
      public PersistentDataBlockService(Context context) {
          super(context);
          mContext = context;