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

Commit e2308709 authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Merge "Make sure all game modes are looped." into sc-dev

parents fb45d8ed b4ade2ad

services/core/java/com/android/server/app/GameManagerService.java

+5 −5
Original line number Diff line number Diff line
@@ -387,12 +387,12 @@ public final class GameManagerService extends IGameManagerService.Stub { 
         * Get an array of a package's available game modes.

         */

        public @GameMode int[] getAvailableGameModes() {



            int modesBitfield = getAvailableGameModesBitfield();

            int sigBits = Integer.bitCount(modesBitfield);

            int[] modes = new int[sigBits];

            final int modesBitfield = getAvailableGameModesBitfield();

            int[] modes = new int[Integer.bitCount(modesBitfield)];

            int i = 0;

            for (int mode = 0; mode < sigBits; ++mode) {

            final int gameModeInHighestBit =

                    Integer.numberOfTrailingZeros(Integer.highestOneBit(modesBitfield));

            for (int mode = 0; mode <= gameModeInHighestBit; ++mode) {

                if (((modesBitfield >> mode) & 1) != 0) {

                    modes[i++] = mode;

                }

services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ public class GameManagerServiceTests { 
            reportedModes.add(mode);

        }

        assertEquals(requiredModes.length, reportedModes.size());

        for (int requiredMode : reportedModes) {

        for (int requiredMode : requiredModes) {

            assertTrue("Required game mode not supported: " + requiredMode,

                    reportedModes.contains(requiredMode));

        }