diff options
| author | Abhijeet Kaur <abkaur@google.com> | 2021-03-03 13:02:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 13:02:43 +0000 |
| commit | 7d0b75e407a1db0859632d0f2c9b82e8cc0191f9 (patch) | |
| tree | 0d8c79ffc6ab8de9a4e8459b7a648329f185003e | |
| parent | 541c8e03f23c1c3d96ca12ba07c8fbbf4267e4e4 (diff) | |
| parent | 6111dc99fed0162dd362de777c54c93ad97ca67f (diff) | |
| download | vold-7d0b75e407a1db0859632d0f2c9b82e8cc0191f9.tar.gz | |
Merge "Remove unused mount modes and re-number the modes for consistency" am: 2d0ea90538 am: 6111dc99fe
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1605433
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic29cce9e12067fdc7ea4827bb25210af7420cd4e
| -rw-r--r-- | VolumeManager.cpp | 9 | ||||
| -rw-r--r-- | binder/android/os/IVold.aidl | 10 |
2 files changed, 4 insertions, 15 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index f97397d5..2697f672 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -543,17 +543,10 @@ bool forkAndRemountChild(uid_t uid, pid_t pid, int nsFd, const char* name, void* case VoldNativeService::REMOUNT_MODE_DEFAULT: storageSource = "/mnt/runtime/default"; break; - case VoldNativeService::REMOUNT_MODE_READ: - storageSource = "/mnt/runtime/read"; - break; - case VoldNativeService::REMOUNT_MODE_WRITE: - case VoldNativeService::REMOUNT_MODE_LEGACY: + case VoldNativeService::REMOUNT_MODE_ANDROID_WRITABLE: case VoldNativeService::REMOUNT_MODE_INSTALLER: storageSource = "/mnt/runtime/write"; break; - case VoldNativeService::REMOUNT_MODE_FULL: - storageSource = "/mnt/runtime/full"; - break; case VoldNativeService::REMOUNT_MODE_PASS_THROUGH: return true; default: diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl index 24a3b383..fd134c55 100644 --- a/binder/android/os/IVold.aidl +++ b/binder/android/os/IVold.aidl @@ -174,13 +174,9 @@ interface IVold { const int REMOUNT_MODE_NONE = 0; const int REMOUNT_MODE_DEFAULT = 1; - const int REMOUNT_MODE_READ = 2; - const int REMOUNT_MODE_WRITE = 3; - const int REMOUNT_MODE_LEGACY = 4; - const int REMOUNT_MODE_INSTALLER = 5; - const int REMOUNT_MODE_FULL = 6; - const int REMOUNT_MODE_PASS_THROUGH = 7; - const int REMOUNT_MODE_ANDROID_WRITABLE = 8; + const int REMOUNT_MODE_INSTALLER = 2; + const int REMOUNT_MODE_PASS_THROUGH = 3; + const int REMOUNT_MODE_ANDROID_WRITABLE = 4; const int VOLUME_STATE_UNMOUNTED = 0; const int VOLUME_STATE_CHECKING = 1; |