Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update mount values to be consistent with IVold.aidl"

Browse Source
This commit is contained in:
Abhijeet Kaur
2021-03-03 10:09:46 +00:00
committed by Gerrit Code Review
parent 453966a20b 67b0a15695
commit ddd2a13c38
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -304,15 +304,14 @@ static std::array<UsapTableEntry, USAP_POOL_SIZE_MAX_LIMIT> gUsapTable;
static FileDescriptorTable* gOpenFdTable = nullptr; static FileDescriptorTable* gOpenFdTable = nullptr;
// Must match values in com.android.internal.os.Zygote. // Must match values in com.android.internal.os.Zygote.
// Note that there are gaps in the constants: // The values should be consistent with IVold.aidl
// This is to further keep the values consistent with IVold.aidl
enum MountExternalKind { enum MountExternalKind {
MOUNT_EXTERNAL_NONE = 0, MOUNT_EXTERNAL_NONE = 0,
MOUNT_EXTERNAL_DEFAULT = 1, MOUNT_EXTERNAL_DEFAULT = 1,
MOUNT_EXTERNAL_INSTALLER = 5, MOUNT_EXTERNAL_INSTALLER = 2,
MOUNT_EXTERNAL_PASS_THROUGH = 7, MOUNT_EXTERNAL_PASS_THROUGH = 3,
MOUNT_EXTERNAL_ANDROID_WRITABLE = 8, MOUNT_EXTERNAL_ANDROID_WRITABLE = 4,
MOUNT_EXTERNAL_COUNT = 9 MOUNT_EXTERNAL_COUNT = 5
}; };
// Must match values in com.android.internal.os.Zygote. // Must match values in com.android.internal.os.Zygote.