commit 4e9fb84063a2ad84df45ade41d301ec3aaf06160
author The Android Open Source Project <initial-contribution@android.com> Wed Sep 26 09:09:05 2012 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Sep 26 09:09:05 2012 -0700
tree 88ded1977b73276f93db557f58128bbb989171ca
parent 9f413b77b05998b2dfe831d8752ba952f524b9ba
parent 2bbf02c9b07369a6a9802486c50830885d873381

Reconcile with jb-mr1-release - do not merge

Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12

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;