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" am: ddd2a13c38 am: 3fe1ba327b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica39ed0f0f774ecf7d0342b6f79f57e6e1fe1f3c
This commit is contained in:
Abhijeet Kaur
2021-03-03 13:02:43 +00:00
committed by Automerger Merge Worker
parent 1238f9f6fa 3fe1ba327b
commit d068d394a5
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.