summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Isaac Katzenelson <isaack@android.com> 2023-02-15 04:22:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-02-15 04:22:17 +0000
commit878fd8dcacd8e40ec8bfd70dd025012d324e707d (patch)
tree28aedb4f2bfb35ba87ba1268ae541830f665c97a
parentbbd6a5ecec3dc586de9669aedc86e67989a49824 (diff)
parent3415fa7f89a773c6544f296870a3cb5f8fc8342d (diff)
Merge "Make onBind final"
-rw-r--r--core/api/system-current.txt2
-rw-r--r--wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index ba5a78998a02..ca726d64d850 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10137,7 +10137,7 @@ package android.net.wifi.sharedconnectivity.service {
public abstract class SharedConnectivityService extends android.app.Service {
ctor public SharedConnectivityService();
ctor public SharedConnectivityService(@NonNull android.os.Handler);
- method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);
+ method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
method public abstract void onConnectKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);
method public abstract void onConnectTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);
method public abstract void onDisconnectTetherNetwork();
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
index 10ef0669aeab..a0b931f24dfe 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
@@ -95,7 +95,7 @@ public abstract class SharedConnectivityService extends Service {
@Override
@Nullable
- public IBinder onBind(@NonNull Intent intent) {
+ public final IBinder onBind(@NonNull Intent intent) {
if (DEBUG) Log.i(TAG, "onBind intent=" + intent);
return new ISharedConnectivityService.Stub() {
@Override