Merge "Add missing android.location.flags-aconfig-java to framework-location" into main (81b273a7) · Commits · e / os / android_frameworks_base

location/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ java_sdk_library {
		"com.android.internal.location",
		],
		libs: [
		"android.location.flags-aconfig-java",
		"app-compat-annotations",
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],

location/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -412,8 +412,8 @@ package android.location {
		field public static final int TYPE_GPS_L1CA = 257; // 0x101
		field public static final int TYPE_GPS_L2CNAV = 258; // 0x102
		field public static final int TYPE_GPS_L5CNAV = 259; // 0x103
		field @FlaggedApi(Flags.FLAG_GNSS_API_NAVIC_L1) public static final int TYPE_IRN_L1 = 1795; // 0x703
		field @FlaggedApi(Flags.FLAG_GNSS_API_NAVIC_L1) public static final int TYPE_IRN_L5 = 1794; // 0x702
		field @FlaggedApi("android.location.flags.gnss_api_navic_l1") public static final int TYPE_IRN_L1 = 1795; // 0x703
		field @FlaggedApi("android.location.flags.gnss_api_navic_l1") public static final int TYPE_IRN_L5 = 1794; // 0x702
		field public static final int TYPE_IRN_L5CA = 1793; // 0x701
		field public static final int TYPE_QZS_L1CA = 1025; // 0x401
		field public static final int TYPE_SBS = 513; // 0x201
		@@ -682,7 +682,7 @@ package android.location.altitude {
		public final class AltitudeConverter {
		ctor public AltitudeConverter();
		method @WorkerThread public void addMslAltitudeToLocation(@NonNull android.content.Context, @NonNull android.location.Location) throws java.io.IOException;
		method @FlaggedApi(Flags.FLAG_GEOID_HEIGHTS_VIA_ALTITUDE_HAL) public boolean tryAddMslAltitudeToLocation(@NonNull android.location.Location);
		method @FlaggedApi("android.location.flags.geoid_heights_via_altitude_hal") public boolean tryAddMslAltitudeToLocation(@NonNull android.location.Location);
		}

		}

location/api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -113,13 +113,13 @@ package android.location {
		}

		public final class GnssMeasurementRequest implements android.os.Parcelable {
		method @FlaggedApi(Flags.FLAG_GNSS_API_MEASUREMENT_REQUEST_WORK_SOURCE) @NonNull public android.os.WorkSource getWorkSource();
		method @FlaggedApi("android.location.flags.gnss_api_measurement_request_work_source") @NonNull public android.os.WorkSource getWorkSource();
		method public boolean isCorrelationVectorOutputsEnabled();
		}

		public static final class GnssMeasurementRequest.Builder {
		method @NonNull public android.location.GnssMeasurementRequest.Builder setCorrelationVectorOutputsEnabled(boolean);
		method @FlaggedApi(Flags.FLAG_GNSS_API_MEASUREMENT_REQUEST_WORK_SOURCE) @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.location.GnssMeasurementRequest.Builder setWorkSource(@Nullable android.os.WorkSource);
		method @FlaggedApi("android.location.flags.gnss_api_measurement_request_work_source") @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.location.GnssMeasurementRequest.Builder setWorkSource(@Nullable android.os.WorkSource);
		}

		public final class GnssReflectingPlane implements android.os.Parcelable {
		@@ -591,7 +591,7 @@ package android.location {

		package android.location.provider {

		@FlaggedApi(Flags.FLAG_NEW_GEOCODER) public final class ForwardGeocodeRequest implements android.os.Parcelable {
		@FlaggedApi("android.location.flags.new_geocoder") public final class ForwardGeocodeRequest implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getCallingAttributionTag();
		method @NonNull public String getCallingPackage();
		@@ -613,7 +613,7 @@ package android.location.provider {
		method @NonNull public android.location.provider.ForwardGeocodeRequest.Builder setCallingAttributionTag(@NonNull String);
		}

		@FlaggedApi(Flags.FLAG_NEW_GEOCODER) public abstract class GeocodeProviderBase {
		@FlaggedApi("android.location.flags.new_geocoder") public abstract class GeocodeProviderBase {
		ctor public GeocodeProviderBase(@NonNull android.content.Context, @NonNull String);
		method @NonNull public final android.os.IBinder getBinder();
		method public abstract void onForwardGeocode(@NonNull android.location.provider.ForwardGeocodeRequest, @NonNull android.os.OutcomeReceiver<java.util.List<android.location.Address>,java.lang.Throwable>);
		@@ -672,7 +672,7 @@ package android.location.provider {
		method public void onProviderRequestChanged(@NonNull String, @NonNull android.location.provider.ProviderRequest);
		}

		@FlaggedApi(Flags.FLAG_NEW_GEOCODER) public final class ReverseGeocodeRequest implements android.os.Parcelable {
		@FlaggedApi("android.location.flags.new_geocoder") public final class ReverseGeocodeRequest implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getCallingAttributionTag();
		method @NonNull public String getCallingPackage();