diff options
| author | David Christie <dnchrist@google.com> | 2022-03-21 23:28:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 23:28:31 +0000 |
| commit | e5d5ade2e1c5598acfa367ea44b4fb5bd6275ba1 (patch) | |
| tree | 1e6599e845008d65526afd3dd3fd5051558e0cf3 /core | |
| parent | 21726fc866a37ecd40f825c614f0ae206ce223bf (diff) | |
| parent | 6ce6f0b8fb1206a5edba8bc720c7db16662131f7 (diff) | |
Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288
Change-Id: I58ea073190e9bf63844b78b4833f78c5a601bd51
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java b/core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java index df13ade2bf5e..bd25b8f2ad88 100644 --- a/core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java +++ b/core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java @@ -16,9 +16,9 @@ package android.hardware.location; +import android.os.BadParcelableException; import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; /** * Geofence Hardware Request used for internal location services communication. @@ -139,11 +139,8 @@ public final class GeofenceHardwareRequestParcelable implements Parcelable { @Override public GeofenceHardwareRequestParcelable createFromParcel(Parcel parcel) { int geofenceType = parcel.readInt(); - if(geofenceType != GeofenceHardwareRequest.GEOFENCE_TYPE_CIRCLE) { - Log.e( - "GeofenceHardwareRequest", - String.format("Invalid Geofence type: %d", geofenceType)); - return null; + if (geofenceType != GeofenceHardwareRequest.GEOFENCE_TYPE_CIRCLE) { + throw new BadParcelableException("Invalid Geofence type: " + geofenceType); } GeofenceHardwareRequest request = GeofenceHardwareRequest.createCircularGeofence( |