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

Commit 5b161e14 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If1d807ff3fb474e3ccc7f75d1f33eb5fcffa0ca3
parents d0291e05 e2308709

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));

        }