commit 66aedd52a2b6e90a8a9c8b9b46a971fce261ba85
author Alan Stokes <alanstokes@google.com> Thu Dec 10 12:45:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 10 12:45:48 2020 +0000
tree 04b64481bd9e7b80ef29bebe66ee940433fcb639
parent 12eb9de463bd9f205482b44473c8aa2f4a8f557e
parent 9ad4f042ff19379519997372fc40b546a363764e

Merge "Enable improved user separation by default." am: 9ad4f042ff

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03847bcfc16d02713d0edcd1435852a813c80e7a

FsCrypt.cpp

diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index ff8c1f4..8f6ba9c 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -795,7 +795,7 @@
 static bool prepare_subdirs(const std::string& action, const std::string& volume_uuid,
                             userid_t user_id, int flags) {
     // TODO(b/141677108): Remove this & make it the default behavior
-    if (android::base::GetProperty("ro.vold.level_from_user", "0") == "1") {
+    if (android::base::GetProperty("ro.vold.level_from_user", "1") == "1") {
         flags |= android::os::IVold::STORAGE_FLAG_LEVEL_FROM_USER;
     }