Merge "Game Loading Time improvement by boosting CPU via ADPF" (4e59b196) · Commits · e / os / android_frameworks_base

core/api/current.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -5443,12 +5443,30 @@ package android.app {

		public final class GameManager {
		method public int getGameMode();
		method public void setGameState(@NonNull android.app.GameState);
		field public static final int GAME_MODE_BATTERY = 3; // 0x3
		field public static final int GAME_MODE_PERFORMANCE = 2; // 0x2
		field public static final int GAME_MODE_STANDARD = 1; // 0x1
		field public static final int GAME_MODE_UNSUPPORTED = 0; // 0x0
		}

		public final class GameState implements android.os.Parcelable {
		ctor public GameState(boolean, int);
		ctor public GameState(boolean, int, @Nullable String, @NonNull android.os.Bundle);
		method public int describeContents();
		method @Nullable public String getDescription();
		method @NonNull public android.os.Bundle getMetadata();
		method public int getMode();
		method public boolean isLoading();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.GameState> CREATOR;
		field public static final int MODE_CONTENT = 4; // 0x4
		field public static final int MODE_GAMEPLAY_INTERRUPTIBLE = 2; // 0x2
		field public static final int MODE_GAMEPLAY_UNINTERRUPTIBLE = 3; // 0x3
		field public static final int MODE_NONE = 1; // 0x1
		field public static final int MODE_UNKNOWN = 0; // 0x0
		}

		public class Instrumentation {
		ctor public Instrumentation();
		method public android.os.TestLooperManager acquireLooperManager(android.os.Looper);

core/java/android/app/GameManager.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -167,4 +167,16 @@ public final class GameManager {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Called by games to communicate the current state to the platform.
		* @param gameState An object set to the current state.
		*/
		public void setGameState(@NonNull GameState gameState) {
		try {
		mService.setGameState(mContext.getPackageName(), gameState, mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

core/java/android/app/GameState.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		parcelable GameState;
		No newline at end of file

core/java/android/app/GameState.java

0 → 100644

+179 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* State of the game passed to the GameManager.
		*
		* This includes a top-level state for the game (indicating if the game can be interrupted without
		* interfering with content that can't be paused). Since content can be loaded in any state, it
		* includes an independent boolean flag to indicate loading status.
		*
		* Free-form metadata (as a Bundle) and a string description can also be specified by the
		* application.
		*/
		public final class GameState implements Parcelable {
		/**
		* Default Game mode is unknown.
		*/
		public static final int MODE_UNKNOWN = 0;

		/**
		* No mode means that the game is not in active play, for example the user is using the game
		* menu.
		*/
		public static final int MODE_NONE = 1;

		/**
		* Indicates if the game is in active, but interruptible, game play.
		*/
		public static final int MODE_GAMEPLAY_INTERRUPTIBLE = 2;

		/**
		* Indicates if the game is in active user play mode, which is real time and cannot be
		* interrupted.
		*/
		public static final int MODE_GAMEPLAY_UNINTERRUPTIBLE = 3;

		/**
		* Indicates that the current content shown is not gameplay related. For example it can be an
		* ad, a web page, a text, or a video.
		*/
		public static final int MODE_CONTENT = 4;

		/**
		* Implement the parcelable interface.
		*/
		public static final @NonNull Creator<GameState> CREATOR = new Creator<GameState>() {
		@Override
		public GameState createFromParcel(Parcel in) {
		return new GameState(in);
		}

		@Override
		public GameState[] newArray(int size) {
		return new GameState[size];
		}
		};

		// Indicates if the game is loading assets/resources/compiling/etc. This is independent of game
		// mode because there could be a loading UI displayed, or there could be loading in the
		// background.
		private final boolean mIsLoading;

		// One of the states listed above.
		private final @GameStateMode int mMode;

		// This is a game specific description. For example can be level or scene name.
		private final @Nullable String mDescription;

		// This contains any other game specific parameters not covered by the fields above. It can be
		// quality parameter data, settings, or game modes.
		private final @NonNull Bundle mMetaData;

		/**
		* Create a GameState with the specified loading status.
		* @param isLoading Whether the game is in the loading state.
		* @param mode The game state mode of type @GameStateMode.
		*/
		public GameState(boolean isLoading, @GameStateMode int mode) {
		this(isLoading, mode, null, new Bundle());
		}

		/**
		* Create a GameState with the given state variables.
		* @param isLoading Whether the game is in the loading state.
		* @param mode The game state mode of type @GameStateMode.
		* @param description An optional description of the state.
		* @param metaData Optional metadata.
		*/
		public GameState(boolean isLoading, @GameStateMode int mode, @Nullable String description,
		@NonNull Bundle metaData) {
		mIsLoading = isLoading;
		mMode = mode;
		mDescription = description;
		mMetaData = metaData;
		}

		private GameState(Parcel in) {
		mIsLoading = in.readBoolean();
		mMode = in.readInt();
		mDescription = in.readString();
		mMetaData = in.readBundle();
		}

		/**
		* @return If the game is loading assets/resources/compiling/etc.
		*/
		public boolean isLoading() {
		return mIsLoading;
		}

		/**
		* @return The game state mode.
		*/
		public @GameStateMode int getMode() {
		return mMode;
		}

		/**
		* @return The state description, or null if one is not set.
		*/
		public @Nullable String getDescription() {
		return mDescription;
		}

		/**
		* @return metadata associated with the state.
		*/
		public @NonNull Bundle getMetadata() {
		return mMetaData;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(@NonNull Parcel parcel, int flags) {
		parcel.writeBoolean(mIsLoading);
		parcel.writeInt(mMode);
		parcel.writeString(mDescription);
		parcel.writeBundle(mMetaData);
		}

		/**
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({MODE_UNKNOWN, MODE_NONE, MODE_GAMEPLAY_INTERRUPTIBLE, MODE_GAMEPLAY_UNINTERRUPTIBLE,
		MODE_CONTENT

		})
		@interface GameStateMode {}
		}

core/java/android/app/IGameManagerService.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.app;

		import android.app.GameState;

		/**
		* @hide
		*/
		@@ -24,4 +26,5 @@ interface IGameManagerService {
		void setGameMode(String packageName, int gameMode, int userId);
		int[] getAvailableGameModes(String packageName);
		boolean getAngleEnabled(String packageName, int userId);
		void setGameState(String packageName, in GameState gameState, int userId);
		}
		No newline at end of file