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

Commit 4a320b3b authored by David Christie's avatar David Christie Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-db1f62fddd154ef5a414bf17435d37f0" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183360

Change-Id: I60ff7a2e0a0d59ca65342a5812c5402a29d52c47
parents fad9dab6 a6984e54

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

+3 −6
Original line number Diff line number Diff line
@@ -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.
@@ -140,10 +140,7 @@ public final class GeofenceHardwareRequestParcelable implements Parcelable { 
        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;

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

            }



            GeofenceHardwareRequest request = GeofenceHardwareRequest.createCircularGeofence(