diff --git a/nearby/framework/java/android/nearby/IScanListener.aidl b/nearby/framework/java/android/nearby/IScanListener.aidl index 3e3b107c0d..80563b7e8c 100644 --- a/nearby/framework/java/android/nearby/IScanListener.aidl +++ b/nearby/framework/java/android/nearby/IScanListener.aidl @@ -34,5 +34,5 @@ oneway interface IScanListener { void onLost(in NearbyDeviceParcelable nearbyDeviceParcelable); /** Reports when there is an error during scanning. */ - void onError(); + void onError(in int errorCode); } diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java index a75abea701..333ba5c0f4 100644 --- a/nearby/framework/java/android/nearby/NearbyManager.java +++ b/nearby/framework/java/android/nearby/NearbyManager.java @@ -376,10 +376,10 @@ public class NearbyManager { } @Override - public void onError() { + public void onError(int errorCode) { mExecutor.execute(() -> { if (mScanCallback != null) { - Log.e("NearbyManager", "onError: There is an error in scan."); + mScanCallback.onError(errorCode); } }); } diff --git a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java index 41d568661e..c3f389b32d 100644 --- a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java +++ b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java @@ -28,6 +28,7 @@ import android.nearby.IScanListener; import android.nearby.NearbyDeviceParcelable; import android.nearby.NearbyManager; import android.nearby.PresenceScanFilter; +import android.nearby.ScanCallback; import android.nearby.ScanFilter; import android.nearby.ScanRequest; import android.os.IBinder; @@ -82,7 +83,7 @@ public class DiscoveryProviderManager implements AbstractDiscoveryProvider.Liste Log.w(TAG, "[DiscoveryProviderManager] scan permission revoked " + "- not forwarding results"); try { - record.getScanListener().onError(); + record.getScanListener().onError(ScanCallback.ERROR_PERMISSION_DENIED); } catch (RemoteException e) { Log.w(TAG, "DiscoveryProviderManager failed to report error.", e); }