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

Commit 40736430 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only use alive users when handling ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into main

parents 5e58083c 490d7825

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { 
                Lists.newArrayList(mCurrentUser, mWorkUser, mCommunalUser));

        when(mUserManager.getUsers()).thenReturn(Lists.newArrayList(

                mCurrentUser, mWorkUser, mSecondaryUser, mCommunalUser));

        when(mUserManager.getAliveUsers()).thenReturn(Lists.newArrayList(

                mCurrentUser, mWorkUser, mSecondaryUser, mCommunalUser));

        when(mUserManager.getProfiles(mSecondaryUser.id)).thenReturn(Lists.newArrayList(

                mSecondaryUser));

        when(mUserManager.getProfilesIncludingCommunal(mSecondaryUser.id)).thenReturn(

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class NotificationLockscreenUserManagerImpl implements 
                    // the user before calling into DPM

                    sendingUserId = mCurrentUserId;

                    @SuppressLint("MissingPermission")

                    List<UserInfo> users = mUserManager.getUsers();

                    List<UserInfo> users = mUserManager.getAliveUsers();

                    for (int i = users.size() - 1; i >= 0; i--) {

                        changed |= updateDpcSettings(users.get(i).id);

                    }