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

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

Change-Id: I916ae078f2745d666b7f6e03506c0621e2290271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Martijn Coenen 2023-07-17 10:48:34 +00:00 committed by Automerger Merge Worker
commit cf6ed75946
2 changed files with 3 additions and 2 deletions

View file

@ -26,7 +26,7 @@ oneway interface IVoldListener {
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,

View file

@ -49,7 +49,8 @@ void VolumeBase::setState(State state) {
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));
}
}