Merge "Allow Game Service to trigger the Game Session creation" (607e78a5) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -10877,9 +10877,11 @@ package android.service.games {

		public class GameService extends android.app.Service {
		ctor public GameService();
		method public final void createGameSession(@IntRange(from=0) int);
		method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method public void onConnected();
		method public void onDisconnected();
		method public void onGameStarted(@NonNull android.service.games.GameStartedEvent);
		field public static final String ACTION_GAME_SERVICE = "android.service.games.action.GAME_SERVICE";
		field public static final String SERVICE_META_DATA = "android.game_service";
		}
		@@ -10897,6 +10899,15 @@ package android.service.games {
		field public static final String ACTION_GAME_SESSION_SERVICE = "android.service.games.action.GAME_SESSION_SERVICE";
		}

		public final class GameStartedEvent implements android.os.Parcelable {
		ctor public GameStartedEvent(@IntRange(from=0) int, @NonNull String);
		method public int describeContents();
		method @NonNull public String getPackageName();
		method @IntRange(from=0) public int getTaskId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.games.GameStartedEvent> CREATOR;
		}

		}

		package android.service.notification {

core/java/android/service/games/GameService.java

+49 −3

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

		package android.service.games;

		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		@@ -38,6 +40,12 @@ import java.util.Objects;
		* when a game session should begin. It is always kept running by the system.
		* Because of this it should be kept as lightweight as possible.
		*
		* <p> Instead of requiring permissions for sensitive actions (e.g., starting a new game session),
		* this class is provided with an {@link IGameServiceController} instance which exposes the
		* sensitive functionality. This controller is provided by the system server when calling the
		* {@link IGameService#connected(IGameServiceController)} method exposed by this class. The system
		* server does so only when creating the bound game service.
		*
		* <p>Heavyweight operations (such as showing UI) should be implemented in the
		* associated {@link GameSessionService} when a game session is taking place. Its
		* implementation should run in a separate process from the {@link GameService}.
		@@ -79,12 +87,13 @@ public class GameService extends Service {
		*/
		public static final String SERVICE_META_DATA = "android.game_service";

		private IGameServiceController mGameServiceController;
		private IGameManagerService mGameManagerService;
		private final IGameService mInterface = new IGameService.Stub() {
		@Override
		public void connected() {
		public void connected(IGameServiceController gameServiceController) {
		Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage(
		GameService::doOnConnected, GameService.this));
		GameService::doOnConnected, GameService.this, gameServiceController));
		}

		@Override
		@@ -92,6 +101,12 @@ public class GameService extends Service {
		Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage(
		GameService::onDisconnected, GameService.this));
		}

		@Override
		public void gameStarted(GameStartedEvent gameStartedEvent) {
		Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage(
		GameService::onGameStarted, GameService.this, gameStartedEvent));
		}
		};

		private final IBinder.DeathRecipient mGameManagerServiceDeathRecipient = () -> {
		@@ -111,7 +126,7 @@ public class GameService extends Service {
		return null;
		}

		private void doOnConnected() {
		private void doOnConnected(@NonNull IGameServiceController gameServiceController) {
		mGameManagerService =
		IGameManagerService.Stub.asInterface(
		ServiceManager.getService(Context.GAME_SERVICE));
		@@ -122,6 +137,7 @@ public class GameService extends Service {
		Log.w(TAG, "Unable to link to death with system service");
		}

		mGameServiceController = gameServiceController;
		onConnected();
		}

		@@ -138,4 +154,34 @@ public class GameService extends Service {
		* The service should clean up any resources that it holds at this point.
		*/
		public void onDisconnected() {}

		/**
		* Called when a game task is started. It is the responsibility of the service to determine what
		* action to take (e.g., request that a game session be created).
		*
		* @param gameStartedEvent Contains information about the game being started.
		*/
		public void onGameStarted(@NonNull GameStartedEvent gameStartedEvent) {}

		/**
		* Call to create a new game session be created for a game. This method may be called
		* by a game service following {@link #onGameStarted}, using the task ID provided by the
		* provided {@link GameStartedEvent} (using {@link GameStartedEvent#getTaskId}).
		*
		* If a game session already exists for the game task, this call will be ignored and the
		* existing session will continue.
		*
		* @param taskId The taskId of the game.
		*/
		public final void createGameSession(@IntRange(from = 0) int taskId) {
		if (mGameServiceController == null) {
		throw new IllegalStateException("Can not call before connected()");
		}

		try {
		mGameServiceController.createGameSession(taskId);
		} catch (RemoteException e) {
		Log.e(TAG, "Request for game session failed", e);
		}
		}
		}

core/java/android/service/games/GameStartedEvent.aidl

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.service.games;


		/**
		* @hide
		*/
		parcelable GameStartedEvent;
		No newline at end of file

core/java/android/service/games/GameStartedEvent.java

0 → 100644

+119 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.service.games;

		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Objects;

		/**
		* Event object provided when a game task is started.
		*
		* This is provided to the Game Service via
		* {@link GameService#onGameStarted(GameStartedEvent)}. It includes the game's taskId
		* (see {@link #getTaskId}) that the game's package name (see {@link #getPackageName}).
		*
		* @hide
		*/
		@SystemApi
		public final class GameStartedEvent implements Parcelable {

		@NonNull
		public static final Parcelable.Creator<GameStartedEvent> CREATOR =
		new Parcelable.Creator<GameStartedEvent>() {
		@Override
		public GameStartedEvent createFromParcel(Parcel source) {
		return new GameStartedEvent(
		source.readInt(),
		source.readString());
		}

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

		private final int mTaskId;
		private final String mPackageName;

		public GameStartedEvent(@IntRange(from = 0) int taskId, @NonNull String packageName) {
		this.mTaskId = taskId;
		this.mPackageName = packageName;
		}

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

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mTaskId);
		dest.writeString(mPackageName);
		}

		/**
		* Unique identifier for the task associated with the game.
		*/
		@IntRange(from = 0)
		public int getTaskId() {
		return mTaskId;
		}

		/**
		* The package name for the game.
		*/
		@NonNull
		public String getPackageName() {
		return mPackageName;
		}

		@Override
		public String toString() {
		return "GameStartedEvent{"
		+ "mTaskId="
		+ mTaskId
		+ ", mPackageName='"
		+ mPackageName
		+ "\'}";
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) {
		return true;
		}

		if (!(o instanceof GameStartedEvent)) {
		return false;
		}

		GameStartedEvent that = (GameStartedEvent) o;
		return mTaskId == that.mTaskId
		&& Objects.equals(mPackageName, that.mPackageName);
		}

		@Override
		public int hashCode() {
		return Objects.hash(mTaskId, mPackageName);
		}
		}

core/java/android/service/games/IGameService.aidl

+5 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package android.service.games;

		import android.service.games.GameStartedEvent;
		import android.service.games.IGameServiceController;

		/**
		* @hide
		*/
		oneway interface IGameService {
		void connected();
		void connected(in IGameServiceController gameServiceController);
		void disconnected();
		void gameStarted(in GameStartedEvent gameStartedEvent);
		}