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

Merge "Reduce GpsStatus API crashes to SDK S+"

Browse Source
This commit is contained in:
Soonil Nagarkar
2019-11-12 17:31:11 +00:00
committed by Android (Google) Code Review
parent b4eae193e8 394b86831b
commit 4fc597fe15
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1810,6 +1810,14 @@ public class LocationManager {
@Deprecated
@RequiresPermission(ACCESS_FINE_LOCATION)
public @Nullable GpsStatus getGpsStatus(@Nullable GpsStatus status) {
UnsupportedOperationException ex = new UnsupportedOperationException(
"GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
throw ex;
} else {
Log.w(TAG, ex);
}
if (status == null) {
status = new GpsStatus();
}
@@ -1837,8 +1845,8 @@ public class LocationManager {
@RequiresPermission(ACCESS_FINE_LOCATION)
public boolean addGpsStatusListener(GpsStatus.Listener listener) {
UnsupportedOperationException ex = new UnsupportedOperationException(
"GpsStatus APIs not supported in R and above, use GnssStatus APIs instead");
if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
"GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
throw ex;
} else {
Log.w(TAG, ex);
@@ -1862,8 +1870,8 @@ public class LocationManager {
@Deprecated
public void removeGpsStatusListener(GpsStatus.Listener listener) {
UnsupportedOperationException ex = new UnsupportedOperationException(
"GpsStatus APIs not supported in R and above, use GnssStatus APIs instead");
if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
"GpsStatus APIs not supported in S and above, use GnssStatus APIs instead");
if (mContext.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.R) {
throw ex;
} else {
Log.w(TAG, ex);