commit 15051c34dd46bfd78d4105e18f96c560f1a2ef9d
author Martijn Coenen <maco@google.com> Mon Jul 17 21:56:39 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 17 21:56:39 2023 +0000
tree 1c8a6635acc58d97db3e2098911925d396a935d8
parent f8472908d6c62c604a14f05549e8a1267df3b494
parent cf6ed75946335bc92ea9f4069a221bde30262d64

Merge "SM: Change volume mountUserId for new user" into main am: c7bed872c0 am: 7f304c1cf3 am: d746d9cbce am: 57f69e62fe am: cf6ed75946

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

Change-Id: Ib26e7ff102aa53f43779d8ca361369460ea74050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

binder/android/os/IVoldListener.aidl

diff --git a/binder/android/os/IVoldListener.aidl b/binder/android/os/IVoldListener.aidl
index b3e4ba5..c4535b5 100644
--- a/binder/android/os/IVoldListener.aidl
+++ b/binder/android/os/IVoldListener.aidl
@@ -26,7 +26,7 @@
 
     void onVolumeCreated(@utf8InCpp String volId,
             int type, @utf8InCpp String diskId, @utf8InCpp String partGuid, int userId);
-    void onVolumeStateChanged(@utf8InCpp String volId, int state);
+    void onVolumeStateChanged(@utf8InCpp String volId, int state, int userId);
     void onVolumeMetadataChanged(@utf8InCpp String volId,
             @utf8InCpp String fsType, @utf8InCpp String fsUuid, @utf8InCpp String fsLabel);
     void onVolumePathChanged(@utf8InCpp String volId,

model/VolumeBase.cpp

diff --git a/model/VolumeBase.cpp b/model/VolumeBase.cpp
index 27448da..e20a049 100644
--- a/model/VolumeBase.cpp
+++ b/model/VolumeBase.cpp
@@ -49,7 +49,8 @@
 
     auto listener = getListener();
     if (listener) {
-        listener->onVolumeStateChanged(getId(), static_cast<int32_t>(mState));
+        listener->onVolumeStateChanged(getId(), static_cast<int32_t>(mState),
+                                       static_cast<int32_t>(mMountUserId));
     }
 }