tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove unused mount modes and re-number the modes for consistency" am: 2d0ea90538

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1605433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958437ce02963f69c3498ef829e9bcbef27dabd4
This commit is contained in:
Abhijeet Kaur 2021-03-03 11:12:54 +00:00 committed by Automerger Merge Worker
commit 6111dc99fe
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
VolumeManager.cpp
View file

@ -543,17 +543,10 @@ bool forkAndRemountChild(uid_t uid, pid_t pid, int nsFd, const char* name, void*
case VoldNativeService::REMOUNT_MODE_DEFAULT: case VoldNativeService::REMOUNT_MODE_DEFAULT:
storageSource = "/mnt/runtime/default"; storageSource = "/mnt/runtime/default";
break; break;
case VoldNativeService::REMOUNT_MODE_READ: case VoldNativeService::REMOUNT_MODE_ANDROID_WRITABLE:
storageSource = "/mnt/runtime/read";
break;
case VoldNativeService::REMOUNT_MODE_WRITE:
case VoldNativeService::REMOUNT_MODE_LEGACY:
case VoldNativeService::REMOUNT_MODE_INSTALLER: case VoldNativeService::REMOUNT_MODE_INSTALLER:
storageSource = "/mnt/runtime/write"; storageSource = "/mnt/runtime/write";
break; break;
case VoldNativeService::REMOUNT_MODE_FULL:
storageSource = "/mnt/runtime/full";
break;
case VoldNativeService::REMOUNT_MODE_PASS_THROUGH: case VoldNativeService::REMOUNT_MODE_PASS_THROUGH:
return true; return true;
default: default:

10
binder/android/os/IVold.aidl
View file

@ -174,13 +174,9 @@ interface IVold {
const int REMOUNT_MODE_NONE = 0; const int REMOUNT_MODE_NONE = 0;
const int REMOUNT_MODE_DEFAULT = 1; const int REMOUNT_MODE_DEFAULT = 1;
const int REMOUNT_MODE_READ = 2; const int REMOUNT_MODE_INSTALLER = 2;
const int REMOUNT_MODE_WRITE = 3; const int REMOUNT_MODE_PASS_THROUGH = 3;
const int REMOUNT_MODE_LEGACY = 4; const int REMOUNT_MODE_ANDROID_WRITABLE = 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 VOLUME_STATE_UNMOUNTED = 0; const int VOLUME_STATE_UNMOUNTED = 0;
const int VOLUME_STATE_CHECKING = 1; const int VOLUME_STATE_CHECKING = 1;