From 517e91e0d82cb2aa11e09aed54c18c20e9aa8972 Mon Sep 17 00:00:00 2001
From: shannonchen <shannonchen@google.com>
Date: Tue, 4 Jan 2022 17:45:22 +0000
Subject: [PATCH] Make onBind methods final for GameService and
 GameSessionService.

Test: N/A, no-op code cleanup
Bug: 213174672
CTS-Coverage-Bug: 206128693
Change-Id: I8aa48c9f27cadb04ae10f9d5d1126c97d0f3931e
---
 core/api/system-current.txt                             | 4 ++--
 core/java/android/service/games/GameService.java        | 2 +-
 core/java/android/service/games/GameSessionService.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 3a48d7cc674cd..957fd4f362ded 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10772,7 +10772,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";
@@ -10787,7 +10787,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";
   }
diff --git a/core/java/android/service/games/GameService.java b/core/java/android/service/games/GameService.java
index b79c0553460f4..7fb83d3087be8 100644
--- a/core/java/android/service/games/GameService.java
+++ b/core/java/android/service/games/GameService.java
@@ -90,7 +90,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();
         }
diff --git a/core/java/android/service/games/GameSessionService.java b/core/java/android/service/games/GameSessionService.java
index a2c88709b62d4..c1a3eb5286c4b 100644
--- a/core/java/android/service/games/GameSessionService.java
+++ b/core/java/android/service/games/GameSessionService.java
@@ -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;
         }