diff options
| author | Paul Duffin <paulduffin@google.com> | 2024-04-18 19:20:53 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2024-04-19 10:24:10 +0100 |
| commit | e9e339fcf489002b8043bcdefea1a25da18fc903 (patch) | |
| tree | 90d7660f4747324f76c3a95c29cd2a8e45e30493 /location | |
| parent | 51e8133dcff4aef934d16c422889290bdb8a5183 (diff) | |
| download | base-e9e339fcf489002b8043bcdefea1a25da18fc903.tar.gz | |
Add missing android.location.flags-aconfig-java to framework-location
Bug: 331251171
Test: m droid
Merged-In: I04282c1c9c567a5be85c6fb058b2cfcb28aac373
Change-Id: I04282c1c9c567a5be85c6fb058b2cfcb28aac373
Diffstat (limited to 'location')
| -rw-r--r-- | location/Android.bp | 1 | ||||
| -rw-r--r-- | location/api/current.txt | 4 | ||||
| -rw-r--r-- | location/api/system-current.txt | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/location/Android.bp b/location/Android.bp index eb7cd01111b2..5ba35ac3328a 100644 --- a/location/Android.bp +++ b/location/Android.bp @@ -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 ], diff --git a/location/api/current.txt b/location/api/current.txt index 0c23d8cd77e0..589e9b791e61 100644 --- a/location/api/current.txt +++ b/location/api/current.txt @@ -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 @Deprecated 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 diff --git a/location/api/system-current.txt b/location/api/system-current.txt index b1cf96d41497..075fbb1f64b3 100644 --- a/location/api/system-current.txt +++ b/location/api/system-current.txt @@ -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 { |