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

Commit 004f633f authored by Ying Xu's avatar Ying Xu Committed by Android (Google) Code Review
Browse files

Merge "Filter out users who are not running"

parents 616b6f57 20ed6dc9

src/java/com/android/internal/telephony/InboundSmsHandler.java

+5 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,11 @@ public abstract class InboundSmsHandler extends StateMachine { 
            // Get a list of currently started users.

            int[] users = null;

            final List<UserHandle> userHandles = mUserManager.getUserHandles(false);

            for (UserHandle handle : userHandles) {

                if (!mUserManager.isUserRunning(handle)) {

                    userHandles.remove(handle);

                }

            }

            if (userHandles.isEmpty()) {

                users = new int[] {user.getIdentifier()};

            } else {

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 


        UserManager userManager = (UserManager)mContext.getSystemService(Context.USER_SERVICE);

        doReturn(true).when(userManager).isUserUnlocked();

        doReturn(true).when(userManager).isUserRunning(any(UserHandle.class));



        List<UserHandle> userHandles = new ArrayList();

        userHandles.add(UserHandle.SYSTEM);