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
This commit is contained in:
David Christie
2022-03-21 23:28:31 +00:00
committed by Automerger Merge Worker

View File

@@ -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(