| commit | e899d26468e9e0f3f53f05f670c8c410ad59b8cd | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Mon Sep 11 15:38:52 2023 -0700 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Dec 13 02:21:17 2023 +0000 |
| tree | 5a84aafd7f0efa938b7bdeff938b50464bc53c82 | |
| parent | a3eb71b63362d554571702dff07424bc2e871d34 [diff] |
[nearby] Catches NPE in ChreDiscoveryProvider Test: -m Ignore-AOSP-First: neary not in aosp yet Fix: 298597342 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d07eee4c1671a3d1d6b6669c338d098cfe488f9) Merged-In: I1ef411aea6db6d0c169aa08c303f4234c77baed9 Change-Id: I1ef411aea6db6d0c169aa08c303f4234c77baed9
diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java index 070a2b6..00f1c38 100644 --- a/nearby/framework/java/android/nearby/NearbyManager.java +++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -284,6 +284,8 @@ */ public void queryOffloadCapability(@NonNull @CallbackExecutor Executor executor, @NonNull Consumer<OffloadCapability> callback) { + Objects.requireNonNull(executor); + Objects.requireNonNull(callback); try { mService.queryOffloadCapability(new OffloadTransport(executor, callback)); } catch (RemoteException e) {
diff --git a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java index d69d42d..0302e4f 100644 --- a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java +++ b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
@@ -155,7 +155,7 @@ builder.setFastPairSupported(version != ChreCommunication.INVALID_NANO_APP_VERSION); try { callback.onQueryComplete(builder.build()); - } catch (RemoteException e) { + } catch (RemoteException | NullPointerException e) { e.printStackTrace(); } });