Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b197c38c authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

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

Merge "Tell vold about users sharing storage with each other." am: 140a69e9 am: 16e3a6a1 am: cc57b70b

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



Change-Id: I72380550d4ccbc5feb435480573920ed60b4d58f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 231b8ccf cc57b70b

services/core/java/com/android/server/StorageManagerService.java

+14 −2
Original line number Diff line number Diff line
@@ -845,7 +845,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 (mLock) {

                        final int size = mVolumes.size();
@@ -1059,7 +1067,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);