| commit | 5909fa000d77f95aabdfd79d730cf8a7bd57880b | [log] [tgz] |
|---|---|---|
| author | Paul Hu <paulhu@google.com> | Mon Apr 11 10:51:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 11 10:51:30 2022 +0000 |
| tree | e0a71de296ae1125757ef60aadd6bdbc8910b652 | |
| parent | 7841624e06d11c50e0bcb5353cc0fbad903d70b5 [diff] | |
| parent | 7dc4b9a8128be84cede4f376714d4cb5161f9322 [diff] |
Merge "Remove InterruptedException from NsdService#create" am: 65a00a1fa5 am: 7dc4b9a812 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059331 Change-Id: I4a196eadd858e701cfb154cc1c25e370a4575b35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service-t/src/com/android/server/ConnectivityServiceInitializer.java b/service-t/src/com/android/server/ConnectivityServiceInitializer.java index e4efa926..626c2eb 100644 --- a/service-t/src/com/android/server/ConnectivityServiceInitializer.java +++ b/service-t/src/com/android/server/ConnectivityServiceInitializer.java
@@ -123,12 +123,8 @@ /** Return NsdService instance or null if current SDK is lower than T */ private NsdService createNsdService(final Context context) { if (!SdkLevel.isAtLeastT()) return null; - try { - return NsdService.create(context); - } catch (InterruptedException e) { - Log.d(TAG, "Unable to get NSD service", e); - return null; - } + + return NsdService.create(context); } /** Return Nearby service instance or null if current SDK is lower than T */
diff --git a/service-t/src/com/android/server/NsdService.java b/service-t/src/com/android/server/NsdService.java index 995f8ae..4086e4e 100644 --- a/service-t/src/com/android/server/NsdService.java +++ b/service-t/src/com/android/server/NsdService.java
@@ -600,7 +600,7 @@ mMDnsEventCallback = new MDnsEventCallback(mNsdStateMachine); } - public static NsdService create(Context context) throws InterruptedException { + public static NsdService create(Context context) { HandlerThread thread = new HandlerThread(TAG); thread.start(); Handler handler = new Handler(thread.getLooper());