Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6984e54 authored by David Christie's avatar David Christie Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-db1f62fddd154ef5a414bf17435d37f0" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. 2p: e20d8ae7
  Update GeofenceHardwareRequestParcelable to match parcel/unparcel format.
parents 49fe62da 5be4f1c4

core/java/android/hardware/location/GeofenceHardwareRequestParcelable.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ 




package android.hardware.location;

package android.hardware.location;





import android.os.BadParcelableException;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.util.Log;





/**

/**

 * Geofence Hardware Request used for internal location services communication.

 * Geofence Hardware Request used for internal location services communication.
@@ -140,10 +140,7 @@ public final class GeofenceHardwareRequestParcelable implements Parcelable { 
        public GeofenceHardwareRequestParcelable createFromParcel(Parcel parcel) {

        public GeofenceHardwareRequestParcelable createFromParcel(Parcel parcel) {

            int geofenceType = parcel.readInt();

            int geofenceType = parcel.readInt();

            if (geofenceType != GeofenceHardwareRequest.GEOFENCE_TYPE_CIRCLE) {

            if (geofenceType != GeofenceHardwareRequest.GEOFENCE_TYPE_CIRCLE) {

                Log.e(

                throw new BadParcelableException("Invalid Geofence type: " + geofenceType);

                        "GeofenceHardwareRequest",

                        String.format("Invalid Geofence type: %d", geofenceType));

                return null;

            }

            }





            GeofenceHardwareRequest request = GeofenceHardwareRequest.createCircularGeofence(

            GeofenceHardwareRequest request = GeofenceHardwareRequest.createCircularGeofence(