LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nearby] Catches NPE in ChreDiscoveryProvider am: e899d26468 am: ebbfeee740

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871061

Change-Id: I38deae29eae221ca76d4c5aa892ecd956c31c0c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xinyi Zhou
2023-12-13 21:14:30 +00:00
committed by Automerger Merge Worker
parent f1f8de49b1 ebbfeee740
commit 2647c464f1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nearby/framework/java/android/nearby/NearbyManager.java
View File

@@ -284,6 +284,8 @@ public class NearbyManager {
*/ */
public void queryOffloadCapability(@NonNull @CallbackExecutor Executor executor, public void queryOffloadCapability(@NonNull @CallbackExecutor Executor executor,
@NonNull Consumer<OffloadCapability> callback) { @NonNull Consumer<OffloadCapability> callback) {
Objects.requireNonNull(executor);
Objects.requireNonNull(callback);
try { try {
mService.queryOffloadCapability(new OffloadTransport(executor, callback)); mService.queryOffloadCapability(new OffloadTransport(executor, callback));
} catch (RemoteException e) { } catch (RemoteException e) {

2
nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
View File

@@ -155,7 +155,7 @@ public class ChreDiscoveryProvider extends AbstractDiscoveryProvider {
builder.setFastPairSupported(version != ChreCommunication.INVALID_NANO_APP_VERSION); builder.setFastPairSupported(version != ChreCommunication.INVALID_NANO_APP_VERSION);
try { try {
callback.onQueryComplete(builder.build()); callback.onQueryComplete(builder.build());
} catch (RemoteException e) { } catch (RemoteException | NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });