Merge "fs_mgr: allow any argument to encryptable" (2c74197c) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+3 −4

Original line number	Diff line number	Diff line
		@@ -188,9 +188,9 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
		#undef CheckFlag

		// Then handle flags that take an argument.
		if (flag == "encryptable=userdata") {
		if (StartsWith(flag, "encryptable=")) {
		// The "encryptable" flag identifies adoptable storage volumes. The
		// argument to this flag must be "userdata".
		// argument to this flag is ignored, but it should be "userdata".
		//
		// Historical note: this flag was originally meant just for /data,
		// to indicate that FDE (full disk encryption) can be enabled.
		@@ -198,8 +198,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
		// storage volumes. Today, FDE is no longer supported, leaving only
		// the adoptable storage volume meaning for this flag.
		entry->fs_mgr_flags.crypt = true;
		} else if (StartsWith(flag, "encryptable=") \|\| StartsWith(flag, "forceencrypt=") \|\|
		StartsWith(flag, "forcefdeorfbe=")) {
		} else if (StartsWith(flag, "forceencrypt=") \|\| StartsWith(flag, "forcefdeorfbe=")) {
		LERROR << "flag no longer supported: " << flag;
		return false;
		} else if (StartsWith(flag, "voldmanaged=")) {