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

* commit 'f7e7ee969d9f286315ff153cb979e29e08cee9f4': Extend the maximum number of partitions from 4 to 32
12 years ago · 5695b4bb1c
parent cd7ab371fc f7e7ee969d
commit 5695b4bb1c
1 changed files with 2 additions and 2 deletions
--- a/DirectVolume.h
+++ b/DirectVolume.h
@ -27,7 +27,7 @@ typedef android::List<char *> PathCollection;

 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 @@ protected:
    int            mOrigDiskMinor;
    int            mOrigPartMinors[MAX_PARTITIONS];
    int            mDiskNumParts;
-    unsigned char  mPendingPartMap;
+    unsigned int   mPendingPartMap;
    int            mIsDecrypted;
    int            mFlags;