From e3d1e4caa9e920d539b3bf5eeb18fc2e152b89eb Mon Sep 17 00:00:00 2001 From: Isaac Katzenelson Date: Wed, 15 Feb 2023 18:48:50 +0000 Subject: 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 --- .../sharedconnectivity/service/SharedConnectivityService.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'wifi/java/src') 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 mCallbacks = new ArrayList<>(); // Used to find DeathRecipient when unregistering a callback to call unlinkToDeath. private final Map 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) { -- cgit v1.2.3-59-g8ed1b