From e715ec1364dec2377698390aa3361d1641c56e54 Mon Sep 17 00:00:00 2001 From: Abhijeet Kaur Date: Wed, 24 Feb 2021 12:33:25 +0000 Subject: [PATCH] Remove unused mount modes and re-number the modes for consistency Also, add REMOUNT_MODE_ANDROID_WRITABLE to return "/mnt/runtime/write". Bug: 148454884 Test: builds Change-Id: I5a38c88f46034c494604bb001cf4d4c400c8f73e --- VolumeManager.cpp | 9 +-------- binder/android/os/IVold.aidl | 10 +++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/VolumeManager.cpp b/VolumeManager.cpp index f97397d..2697f67 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 24a3b38..fd134c5 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; -- 2.11.0