summaryrefslogtreecommitdiff
path: root/wifi/java
diff options
context:
space:
mode:
author Isaac Katzenelson <isaackatz@google.com> 2023-02-15 18:48:50 +0000
committer Andrew Sapperstein <asapperstein@google.com> 2023-02-17 14:46:31 +0000
commite3d1e4caa9e920d539b3bf5eeb18fc2e152b89eb (patch)
tree3aa5b4ed9c65aae8d49af4963fa7f1bf667410da /wifi/java
parent7137d9165d25c7ddec6fe92e9d83a83ceceeafb0 (diff)
Remove constructors and defer creating the Handler to onBind.
Previously, the Handler couldn't be built because we tried to call getMainLooper() before the Service's base context was attached. Bug: 268741053 API-Coverage-Bug: 265968015 Test: atest SharedConnectivityServiceTest Change-Id: I70caac89ca69545e62b177872ef144b031cc4846
Diffstat (limited to 'wifi/java')
-rw-r--r--wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java11
1 files changed, 2 insertions, 9 deletions
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 13084f47efe6..f3af06247576 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java
@@ -59,7 +59,7 @@ public abstract class SharedConnectivityService extends Service {
private static final String TAG = SharedConnectivityService.class.getSimpleName();
private static final boolean DEBUG = true;
- private final Handler mHandler;
+ private Handler mHandler;
private final List<ISharedConnectivityCallback> mCallbacks = new ArrayList<>();
// Used to find DeathRecipient when unregistering a callback to call unlinkToDeath.
private final Map<ISharedConnectivityCallback, DeathRecipient> mDeathRecipientMap =
@@ -71,14 +71,6 @@ public abstract class SharedConnectivityService extends Service {
private TetherNetworkConnectionStatus mTetherNetworkConnectionStatus;
private KnownNetworkConnectionStatus mKnownNetworkConnectionStatus;
- public SharedConnectivityService() {
- mHandler = new Handler(getMainLooper());
- }
-
- public SharedConnectivityService(@NonNull Handler handler) {
- mHandler = handler;
- }
-
private final class DeathRecipient implements IBinder.DeathRecipient {
ISharedConnectivityCallback mCallback;
@@ -97,6 +89,7 @@ public abstract class SharedConnectivityService extends Service {
@Nullable
public final IBinder onBind(@NonNull Intent intent) {
if (DEBUG) Log.i(TAG, "onBind intent=" + intent);
+ mHandler = new Handler(getMainLooper());
return new ISharedConnectivityService.Stub() {
@Override
public void registerCallback(ISharedConnectivityCallback callback) {