Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change getGnssCapabilites() return type to @NonNull" into qt-dev

Browse Source
This commit is contained in:
Anil Admal
2019-04-23 15:31:48 +00:00
committed by Android (Google) Code Review
parent 25b06f04d4 ec6ec82ef5
commit 69195f2b92
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -3399,7 +3399,7 @@ package android.location {
method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch(); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch();
method @Nullable public String getExtraLocationControllerPackage(); method @Nullable public String getExtraLocationControllerPackage();
method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public int getGnssBatchSize(); 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 @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void injectGnssMeasurementCorrections(@NonNull android.location.GnssMeasurementCorrections);
method public boolean isExtraLocationControllerPackageEnabled(); method public boolean isExtraLocationControllerPackageEnabled();
method public boolean isLocationEnabledForUser(@NonNull android.os.UserHandle); method public boolean isLocationEnabledForUser(@NonNull android.os.UserHandle);

10
location/java/android/location/LocationManager.java
View File

@@ -1986,17 +1986,19 @@ public class LocationManager {
} }
/** /**
* Returns the supported capabilities of the GNSS chipset or {@code null} if there is an error * Returns the supported capabilities of the GNSS chipset.
* in obtaining the capabilities. *
* @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present.
* *
* @hide * @hide
*/ */
@SystemApi @SystemApi
public @Nullable GnssCapabilities getGnssCapabilities() { @RequiresPermission(ACCESS_FINE_LOCATION)
public @NonNull GnssCapabilities getGnssCapabilities() {
try { try {
long gnssCapabilities = mGnssMeasurementCallbackTransport.getGnssCapabilities(); long gnssCapabilities = mGnssMeasurementCallbackTransport.getGnssCapabilities();
if (gnssCapabilities == GnssCapabilities.INVALID_CAPABILITIES) { if (gnssCapabilities == GnssCapabilities.INVALID_CAPABILITIES) {
return null; gnssCapabilities = 0L;
} }
return GnssCapabilities.of(gnssCapabilities); return GnssCapabilities.of(gnssCapabilities);
} catch (RemoteException e) { } catch (RemoteException e) {