commit fe83792eec52957b6f231048e3fc217035451255
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 25 15:24:56 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 25 15:24:56 2019 +0000
tree e8b41742ca3a10c75e9382307c026fc747c2aa71
parent c659b0a8bfcba6259208d5db3cf945aaadb76493
parent 54bf4c03d13f53e45b46819cd0e1123d1d9e6afc

Merge "Don't automatically start user 0."

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 546f802..3b7e6e1 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -697,12 +697,6 @@
         vol->destroy();
     }
     mInternalEmulatedVolumes.clear();
-    // Add user 0 cos it's always running and started
-    auto vol = std::shared_ptr<android::vold::VolumeBase>(
-            new android::vold::EmulatedVolume("/data/media", 0));
-    vol->setMountUserId(0);
-    vol->create();
-    mInternalEmulatedVolumes.push_back(vol);
 
     for (const auto& disk : mDisks) {
         disk->destroy();
@@ -711,8 +705,6 @@
     updateVirtualDisk();
     mAddedUsers.clear();
     mStartedUsers.clear();
-
-    mStartedUsers.insert(0);
     return 0;
 }