commit 06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5
author Ken Sumrall <ksumrall@android.com> Tue Oct 09 15:11:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 15:11:18 2012 -0700
tree 75007f09318df2f96cc375064168c7df005c154b
parent f1e72279ffbff47ef404e8f7d8c9bd7306f8382d
parent 9dedfd473dc59e0277004e5b917e4eced02c8af5

am 9dedfd47: Fix encryption on certain devices

* commit '9dedfd473dc59e0277004e5b917e4eced02c8af5':
  Fix encryption on certain devices

DirectVolume.h

diff --git a/DirectVolume.h b/DirectVolume.h
index de1ed8b..c0139d4 100644
--- a/DirectVolume.h
+++ b/DirectVolume.h
@@ -27,7 +27,7 @@
 
 class DirectVolume : public Volume {
 public:
-    static const int MAX_PARTITIONS = 4;
+    static const int MAX_PARTITIONS = 32;
 protected:
     PathCollection *mPaths;
     int            mDiskMajor;
@@ -37,7 +37,7 @@
     int            mOrigDiskMinor;
     int            mOrigPartMinors[MAX_PARTITIONS];
     int            mDiskNumParts;
-    unsigned char  mPendingPartMap;
+    unsigned int   mPendingPartMap;
     int            mIsDecrypted;
     int            mFlags;