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

Commit 58e64481 authored by Anil Admal's avatar Anil Admal Committed by android-build-merger
Browse files

Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev am: 69195f2b 

am: f249ed89

Change-Id: I84f4ae837fa24b089defc7a6ffc39b39dd880858
parents d292ed56 f249ed89

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3400,7 +3400,7 @@ package android.location { 
    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch();

    method @Nullable public String getExtraLocationControllerPackage();

    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public int getGnssBatchSize();

    method @Nullable public android.location.GnssCapabilities getGnssCapabilities();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.location.GnssCapabilities getGnssCapabilities();

    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void injectGnssMeasurementCorrections(@NonNull android.location.GnssMeasurementCorrections);

    method public boolean isExtraLocationControllerPackageEnabled();

    method public boolean isLocationEnabledForUser(@NonNull android.os.UserHandle);

location/java/android/location/LocationManager.java

+6 −4
Original line number Diff line number Diff line
@@ -1986,17 +1986,19 @@ public class LocationManager { 
    }



    /**

     * Returns the supported capabilities of the GNSS chipset or {@code null} if there is an error

     * in obtaining the capabilities.

     * Returns the supported capabilities of the GNSS chipset.

     *

     * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present.

     *

     * @hide

     */

    @SystemApi

    public @Nullable GnssCapabilities getGnssCapabilities() {

    @RequiresPermission(ACCESS_FINE_LOCATION)

    public @NonNull GnssCapabilities getGnssCapabilities() {

        try {

            long gnssCapabilities = mGnssMeasurementCallbackTransport.getGnssCapabilities();

            if (gnssCapabilities == GnssCapabilities.INVALID_CAPABILITIES) {

                return null;

                gnssCapabilities = 0L;

            }

            return GnssCapabilities.of(gnssCapabilities);

        } catch (RemoteException e) {