| commit | ebbfeee740e42732ace3b0d8ea63f3d96f27d94a | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Wed Dec 13 20:42:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 20:42:32 2023 +0000 |
| tree | 132f33f951c34fff9a4d1ed571c92f692e8bb67f | |
| parent | 2408fda2a8b6ddb60a29d0dd4acaa733c4e34e5b [diff] | |
| parent | e899d26468e9e0f3f53f05f670c8c410ad59b8cd [diff] |
[nearby] Catches NPE in ChreDiscoveryProvider am: e899d26468 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871061 Change-Id: I4a8a0358c93bf7146de9222e11ae4b12101a5071 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); } });