From 1127d92acd841fb1be08515684d04d57e3a0296b Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Fri, 5 Apr 2019 12:46:35 -0700
Subject: [PATCH] Revert "With native FBE, lock user directories when framework
 is started"

This reverts commit 171217cb379a67bbd57790b9118b94cab61ad41c.

Somehow, users may be started before this runs.  Revert it for now.

Bug: 129956131
Test: none (clean revert)
Change-Id: I609162d0c449376e2026c8db18ffb39152e10027
---
 .../android/server/StorageManagerService.java | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 307919223a2b1..0786b1819b717 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -929,20 +929,13 @@ class StorageManagerService extends IStorageManager.Stub
     private void initIfBootedAndConnected() {
         Slog.d(TAG, "Thinking about init, mBootCompleted=" + mBootCompleted
                 + ", mDaemonConnected=" + mDaemonConnected);
-        if (mBootCompleted && mDaemonConnected) {
-            // Tell vold to lock or unlock the user directories based on the
-            // current file-based encryption status.
-            final boolean initLocked;
-            if (StorageManager.isFileEncryptedNativeOrEmulated()) {
-                // For native FBE this is a no-op after reboot, but this is
-                // still needed in case of framework restarts.
-                Slog.d(TAG, "FBE is enabled; ensuring all user directories are locked.");
-                initLocked = true;
-            } else {
-                // This is in case FBE emulation was turned off.
-                Slog.d(TAG, "FBE is disabled; ensuring the FBE emulation state is cleared.");
-                initLocked = false;
-            }
+        if (mBootCompleted && mDaemonConnected
+                && !StorageManager.isFileEncryptedNativeOnly()) {
+            // When booting a device without native support, make sure that our
+            // user directories are locked or unlocked based on the current
+            // emulation status.
+            final boolean initLocked = StorageManager.isFileEncryptedEmulatedOnly();
+            Slog.d(TAG, "Setting up emulation state, initlocked=" + initLocked);
             final List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
             for (UserInfo user : users) {
                 try {