commit 62bbb2b1d204dd3ee09d7082bbe89e7f8d2c52d6
author Sudheer Shanka <sudheersai@google.com> Wed Aug 01 01:09:10 2018 -0700
committer Sudheer Shanka <sudheersai@google.com> Wed Aug 01 01:23:15 2018 -0700
tree 59f1f57dd904be22abf16256b3c4615b6ad4c195
parent ebaad1c848d6363b2a8a837f7b4256ab3c750688

Update vold to handle package info from StorageManagerService.

Bug: 111890351
Test: n/a
Change-Id: I098ad4bc15fae843909d97dad5d301a4e53d51bc

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index b3cf9bf..049adc8 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -380,6 +380,7 @@
     fs_prepare_dir(path.c_str(), 0755, AID_ROOT, AID_ROOT);
 
     mStartedUsers.insert(userId);
+    mUserPackages[userId] = packageNames;
     if (mPrimary) {
         linkPrimary(userId);
     }
@@ -393,11 +394,17 @@
 
 int VolumeManager::addAppIds(const std::vector<std::string>& packageNames,
         const std::vector<int32_t>& appIds) {
+    for (size_t i = 0; i < packageNames.size(); ++i) {
+        mAppIds[packageNames[i]] = appIds[i];
+    }
     return 0;
 }
 
 int VolumeManager::addSandboxIds(const std::vector<int32_t>& appIds,
         const std::vector<std::string>& sandboxIds) {
+    for (size_t i = 0; i < appIds.size(); ++i) {
+        mSandboxIds[appIds[i]] = sandboxIds[i];
+    }
     return 0;
 }
 
@@ -587,6 +594,10 @@
     updateVirtualDisk();
     mAddedUsers.clear();
     mStartedUsers.clear();
+
+    mUserPackages.clear();
+    mAppIds.clear();
+    mSandboxIds.clear();
     return 0;
 }
 

VolumeManager.h

diff --git a/VolumeManager.h b/VolumeManager.h
index bd70653..5583c8c 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -160,6 +160,10 @@
     std::shared_ptr<android::vold::VolumeBase> mInternalEmulated;
     std::shared_ptr<android::vold::VolumeBase> mPrimary;
 
+    std::unordered_map<std::string, appid_t> mAppIds;
+    std::unordered_map<appid_t, std::string> mSandboxIds;
+    std::unordered_map<userid_t, std::vector<std::string>> mUserPackages;
+
     int mNextObbId;
     bool mSecureKeyguardShowing;
 };