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

Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig"

Browse Source
This commit is contained in:
Treehugger Robot
2020-08-26 20:07:35 +00:00
committed by Gerrit Code Review
parent 1f17c75beb df4111c2ab
commit d09cf27486
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/location/GnssConfiguration.java
View File

@@ -21,6 +21,7 @@ import android.os.PersistableBundle;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.StatsLog; import android.util.StatsLog;
@@ -236,6 +237,13 @@ class GnssConfiguration {
logConfigurations(); logConfigurations();
final HalInterfaceVersion gnssConfigurationIfaceVersion = getHalInterfaceVersion(); final HalInterfaceVersion gnssConfigurationIfaceVersion = getHalInterfaceVersion();
TelephonyManager phone = (TelephonyManager)
mContext.getSystemService(Context.TELEPHONY_SERVICE);
int ddSubId = SubscriptionManager.getDefaultDataSubscriptionId();
String simOperator = SubscriptionManager.isValidSubscriptionId(ddSubId)
? phone.getSimOperator(ddSubId) : phone.getSimOperator();
if (gnssConfigurationIfaceVersion != null) { if (gnssConfigurationIfaceVersion != null) {
// Set to a range checked value. // Set to a range checked value.
if (isConfigEsExtensionSecSupported(gnssConfigurationIfaceVersion) if (isConfigEsExtensionSecSupported(gnssConfigurationIfaceVersion)
@@ -271,7 +279,7 @@ class GnssConfiguration {
try { try {
int propertyValueInt = Integer.decode(propertyValueString); int propertyValueInt = Integer.decode(propertyValueString);
boolean result = entry.getValue().set(propertyValueInt); boolean result = entry.getValue().set(propertyValueInt);
if (!result) { if (!result && !TextUtils.isEmpty(simOperator)) {
Log.e(TAG, "Unable to set " + propertyName); Log.e(TAG, "Unable to set " + propertyName);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {