Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make onBind methods final for GameService and GameSessionService."

Browse Source
This commit is contained in:
Shannon Chen
2022-01-12 19:46:09 +00:00
committed by Android (Google) Code Review
parent 15a69c6f66 517e91e0d8
commit b628834dc3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

@@ -10819,7 +10819,7 @@ package android.service.games {
public class GameService extends android.app.Service {
ctor public GameService();
method @Nullable public android.os.IBinder onBind(@Nullable android.content.Intent);
method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
method public void onConnected();
method public void onDisconnected();
field public static final String ACTION_GAME_SERVICE = "android.service.games.action.GAME_SERVICE";
@@ -10834,7 +10834,7 @@ package android.service.games {
public abstract class GameSessionService extends android.app.Service {
ctor public GameSessionService();
method @Nullable public android.os.IBinder onBind(@Nullable android.content.Intent);
method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
method @NonNull public abstract android.service.games.GameSession onNewSession(@NonNull android.service.games.CreateGameSessionRequest);
field public static final String ACTION_GAME_SESSION_SERVICE = "android.service.games.action.GAME_SESSION_SERVICE";
}

2
core/java/android/service/games/GameService.java
View File

@@ -103,7 +103,7 @@ public class GameService extends Service {
@Override
@Nullable
public IBinder onBind(@Nullable Intent intent) {
public final IBinder onBind(@Nullable Intent intent) {
if (ACTION_GAME_SERVICE.equals(intent.getAction())) {
return mInterface.asBinder();
}

2
core/java/android/service/games/GameSessionService.java
View File

@@ -73,7 +73,7 @@ public abstract class GameSessionService extends Service {
@Override
@Nullable
public IBinder onBind(@Nullable Intent intent) {
public final IBinder onBind(@Nullable Intent intent) {
if (intent == null) {
return null;
}