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

Commit 7eadcb9b authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Remove system user from displaying in Storage Settings in HSUM"

parents 2122313b db6b0292

src/com/android/settings/deviceinfo/storage/NonCurrentUserController.java

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class NonCurrentUserController extends AbstractPreferenceController imple 
        List<NonCurrentUserController> controllers = new ArrayList<>();

        List<UserInfo> infos = userManager.getUsers();

        for (UserInfo info : infos) {

            if (info.id == currentUserId || info.isProfile()) {

            if (info.id == currentUserId || !info.isFull()) {

                continue;

            }

            int[] profiles = userManager.getProfileIds(info.id, false /* enabledOnly */);

tests/robotests/src/com/android/settings/deviceinfo/storage/NonCurrentUserControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class NonCurrentUserControllerTest { 
        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mPrimaryUser = new UserInfo();

        mPrimaryUser.flags = UserInfo.FLAG_PRIMARY;

        mPrimaryUser.flags = UserInfo.FLAG_PRIMARY | UserInfo.FLAG_FULL;

        mController = new NonCurrentUserController(mContext, mPrimaryUser);

        ShadowActivityManager.setService(mActivityService);
@@ -267,6 +267,8 @@ public class NonCurrentUserControllerTest { 
        secondaryUser.id = 10;

        final UserInfo secondaryUser1 = spy(new UserInfo());

        secondaryUser1.id = 11;

        secondaryUser.flags = UserInfo.FLAG_FULL;

        secondaryUser1.flags = UserInfo.FLAG_FULL;

        userInfo.add(mPrimaryUser);

        userInfo.add(secondaryUser);

        userInfo.add(secondaryUser1);