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

Commit 93b6f4b0 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Add missing android.location.flags-aconfig-java to framework-location"... 

Merge "Add missing android.location.flags-aconfig-java to framework-location" into main am: f6b04110

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



Change-Id: I9e68f75b94e8ef1a315be63dc3f31872e1f28a45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f848944b f6b04110

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

+2 −2
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 @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

location/api/system-current.txt

+2 −2
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 {