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

Commit b628834d authored by Shannon Chen's avatar Shannon Chen Committed by Android (Google) Code Review
Browse files

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

parents 15a69c6f 517e91e0

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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";















  }

























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



+1
−1




























Original line number
Diff line number
Diff line








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















        }

































core/java/android/service/games/GameSessionService.java



+1
−1




























Original line number
Diff line number
Diff line








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















        }