commit e0906ce9dcdedc6c54ab666f5f42e5d29b216a25
author Elliott Hughes <enh@google.com> Tue Sep 25 12:33:32 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 25 12:33:32 2012 -0700
tree a7e14f4a7a9ae103d97113fde64b49ace106d5ab
parent 952e6888520c21ddbff3723732253f5a1cd44b6c
parent 5695b4bb1c87a5c6ca884262f7940526ddcc5883

am 5695b4bb: am f7e7ee96: am 2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"

* commit '5695b4bb1c87a5c6ca884262f7940526ddcc5883':
  Extend the maximum number of partitions from 4 to 32

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;