diff options
| author | David Christie <dnchrist@google.com> | 2022-03-22 05:10:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-22 05:10:37 +0000 |
| commit | 21b078e99fa3ceed44c83d917d01bb8042d77883 (patch) | |
| tree | 634ba45a1563f5fcd369bb0d6aec56518704c03d /core/java/android | |
| parent | 972089ad309d2f914913c3e8a737ecc27626881b (diff) | |
| parent | 3e1ffdb29417f4fb994587a013fa56c83e157f6f (diff) | |
Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. am: 3e1ffdb294
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185256
Change-Id: Ibe74e45782650c3d972306d5e43b4f646be78c79
Diffstat (limited to 'core/java/android')
| -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( |