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
This commit is contained in:
parent
a98846d8d5
commit
e715ec1364
2 changed files with 4 additions and 15 deletions
|
@ -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:
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue