Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tell vold about users sharing storage with each other." am: 140a69e94f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189723

Change-Id: I15dc262e49136c770f7415f15d9c9f7129bf1de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Martijn Coenen
2022-12-09 08:03:52 +00:00
committed by Automerger Merge Worker
parent 1a8ac14677 140a69e94f
commit 16e3a6a180
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -897,7 +897,15 @@ class StorageManagerService extends IStorageManager.Stub
if (Intent.ACTION_USER_ADDED.equals(action)) {
final UserManager um = mContext.getSystemService(UserManager.class);
final int userSerialNumber = um.getUserSerialNumber(userId);
mVold.onUserAdded(userId, userSerialNumber);
final UserInfo userInfo = um.getUserInfo(userId);
if (userInfo.isCloneProfile()) {
// Only clone profiles share storage with their parent
mVold.onUserAdded(userId, userSerialNumber,
userInfo.profileGroupId /* sharesStorageWithUserId */);
} else {
mVold.onUserAdded(userId, userSerialNumber,
-1 /* shareStorageWithUserId */);
}
} else if (Intent.ACTION_USER_REMOVED.equals(action)) {
synchronized (mVolumes) {
final int size = mVolumes.size();
@@ -1146,7 +1154,11 @@ class StorageManagerService extends IStorageManager.Stub
// Tell vold about all existing and started users
for (UserInfo user : users) {
mVold.onUserAdded(user.id, user.serialNumber);
if (user.isCloneProfile()) {
mVold.onUserAdded(user.id, user.serialNumber, user.profileGroupId);
} else {
mVold.onUserAdded(user.id, user.serialNumber, -1);
}
}
for (int userId : systemUnlockedUsers) {
mVold.onUserStarted(userId);