summaryrefslogtreecommitdiff
path: root/location/java
diff options
context:
space:
mode:
author Yu-Han Yang <yuhany@google.com> 2023-08-09 22:57:12 +0000
committer Yu-Han Yang <yuhany@google.com> 2023-08-10 22:24:03 +0000
commit420fd08ed3d64cd764aff8152c8efe1371ee1372 (patch)
tree076f49b8ae0d15bd4416f43d54ab6a1b25d1d6fd /location/java
parent06559e0968aaca2b72334dc80a67bd340d264308 (diff)
Add WorkSource in GnssMeasurementRequest
Bug: 295235160 Test: atest GnssMeasurementRequestTest Change-Id: I679a6bf7f110ec55db12e8381f8bf3efd43a727e
Diffstat (limited to 'location/java')
-rw-r--r--location/java/android/location/GnssMeasurementRequest.java62
1 files changed, 56 insertions, 6 deletions
diff --git a/location/java/android/location/GnssMeasurementRequest.java b/location/java/android/location/GnssMeasurementRequest.java
index 3f3ad759ed07..65af3928bd02 100644
--- a/location/java/android/location/GnssMeasurementRequest.java
+++ b/location/java/android/location/GnssMeasurementRequest.java
@@ -16,11 +16,15 @@
package android.location;
+import android.Manifest;
import android.annotation.IntRange;
import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.WorkSource;
import android.util.TimeUtils;
import com.android.internal.util.Preconditions;
@@ -46,15 +50,16 @@ public final class GnssMeasurementRequest implements Parcelable {
private final boolean mCorrelationVectorOutputsEnabled;
private final boolean mFullTracking;
private final int mIntervalMillis;
-
+ private WorkSource mWorkSource;
/**
* Creates a {@link GnssMeasurementRequest} with a full list of parameters.
*/
private GnssMeasurementRequest(boolean fullTracking, boolean correlationVectorOutputsEnabled,
- int intervalMillis) {
+ int intervalMillis, WorkSource workSource) {
mFullTracking = fullTracking;
mCorrelationVectorOutputsEnabled = correlationVectorOutputsEnabled;
mIntervalMillis = intervalMillis;
+ mWorkSource = Objects.requireNonNull(workSource);
}
/**
@@ -107,14 +112,31 @@ public final class GnssMeasurementRequest implements Parcelable {
return mIntervalMillis;
}
+ /**
+ * Returns the work source used for power blame for this request. If empty (i.e.,
+ * {@link WorkSource#isEmpty()} is {@code true}, the system is free to assign power blame as it
+ * deems most appropriate.
+ *
+ * @return the work source used for power blame for this request
+ *
+ * @hide
+ */
+ @SystemApi
+ public @NonNull WorkSource getWorkSource() {
+ return mWorkSource;
+ }
+
@NonNull
public static final Creator<GnssMeasurementRequest> CREATOR =
new Creator<GnssMeasurementRequest>() {
@Override
@NonNull
public GnssMeasurementRequest createFromParcel(@NonNull Parcel parcel) {
- return new GnssMeasurementRequest(parcel.readBoolean(), parcel.readBoolean(),
- parcel.readInt());
+ return new GnssMeasurementRequest(
+ /* fullTracking= */ parcel.readBoolean(),
+ /* correlationVectorOutputsEnabled= */ parcel.readBoolean(),
+ /* intervalMillis= */ parcel.readInt(),
+ /* workSource= */ parcel.readTypedObject(WorkSource.CREATOR));
}
@Override
@@ -128,6 +150,7 @@ public final class GnssMeasurementRequest implements Parcelable {
parcel.writeBoolean(mFullTracking);
parcel.writeBoolean(mCorrelationVectorOutputsEnabled);
parcel.writeInt(mIntervalMillis);
+ parcel.writeTypedObject(mWorkSource, 0);
}
@NonNull
@@ -147,6 +170,9 @@ public final class GnssMeasurementRequest implements Parcelable {
if (mCorrelationVectorOutputsEnabled) {
s.append(", CorrelationVectorOutputs");
}
+ if (mWorkSource != null && !mWorkSource.isEmpty()) {
+ s.append(", ").append(mWorkSource);
+ }
s.append(']');
return s.toString();
}
@@ -165,12 +191,16 @@ public final class GnssMeasurementRequest implements Parcelable {
if (mIntervalMillis != other.mIntervalMillis) {
return false;
}
+ if (!Objects.equals(mWorkSource, other.mWorkSource)) {
+ return false;
+ }
return true;
}
@Override
public int hashCode() {
- return Objects.hash(mFullTracking, mCorrelationVectorOutputsEnabled, mIntervalMillis);
+ return Objects.hash(mFullTracking, mCorrelationVectorOutputsEnabled, mIntervalMillis,
+ mWorkSource);
}
@Override
@@ -183,6 +213,7 @@ public final class GnssMeasurementRequest implements Parcelable {
private boolean mCorrelationVectorOutputsEnabled;
private boolean mFullTracking;
private int mIntervalMillis;
+ private WorkSource mWorkSource;
/**
* Constructs a {@link Builder} instance.
@@ -197,6 +228,7 @@ public final class GnssMeasurementRequest implements Parcelable {
mCorrelationVectorOutputsEnabled = request.isCorrelationVectorOutputsEnabled();
mFullTracking = request.isFullTracking();
mIntervalMillis = request.getIntervalMillis();
+ mWorkSource = request.getWorkSource();
}
/**
@@ -255,11 +287,29 @@ public final class GnssMeasurementRequest implements Parcelable {
return this;
}
+ /**
+ * Sets the work source to use for power blame for this request. Passing in null or leaving
+ * it unset will be an empty WorkSource, which implies the system is free to assign power
+ * blame as it determines best for this request (which usually means blaming the owner of
+ * the GnssMeasurement listener).
+ *
+ * <p>Permissions enforcement occurs when resulting request is actually used, not when this
+ * method is invoked.
+ *
+ * @hide
+ */
+ @SystemApi
+ @RequiresPermission(Manifest.permission.UPDATE_DEVICE_STATS)
+ public @NonNull Builder setWorkSource(@Nullable WorkSource workSource) {
+ mWorkSource = workSource;
+ return this;
+ }
+
/** Builds a {@link GnssMeasurementRequest} instance as specified by this builder. */
@NonNull
public GnssMeasurementRequest build() {
return new GnssMeasurementRequest(mFullTracking, mCorrelationVectorOutputsEnabled,
- mIntervalMillis);
+ mIntervalMillis, new WorkSource(mWorkSource));
}
}
}