Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe1ba32 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2851203ddb2af3702f9603eefd17bc26fc9aab64
parents f388bf48 ddd2a13c

core/jni/com_android_internal_os_Zygote.cpp

+5 −6
Original line number Diff line number Diff line
@@ -304,15 +304,14 @@ static std::array<UsapTableEntry, USAP_POOL_SIZE_MAX_LIMIT> gUsapTable; 
static FileDescriptorTable* gOpenFdTable = nullptr;



// Must match values in com.android.internal.os.Zygote.

// Note that there are gaps in the constants:

// This is to further keep the values consistent with IVold.aidl

// The values should be consistent with IVold.aidl

enum MountExternalKind {

    MOUNT_EXTERNAL_NONE = 0,

    MOUNT_EXTERNAL_DEFAULT = 1,

    MOUNT_EXTERNAL_INSTALLER = 5,

    MOUNT_EXTERNAL_PASS_THROUGH = 7,

    MOUNT_EXTERNAL_ANDROID_WRITABLE = 8,

    MOUNT_EXTERNAL_COUNT = 9

    MOUNT_EXTERNAL_INSTALLER = 2,

    MOUNT_EXTERNAL_PASS_THROUGH = 3,

    MOUNT_EXTERNAL_ANDROID_WRITABLE = 4,

    MOUNT_EXTERNAL_COUNT = 5

};



// Must match values in com.android.internal.os.Zygote.