diff options
| author | Wink Saville <wink@google.com> | 2012-04-09 13:41:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-09 13:41:49 -0700 |
| commit | 283be258696d9043ced4003872e0cfe109c4de66 (patch) | |
| tree | 633f495391f3876d512f0a9daa9763dca1d7d1e9 | |
| parent | 425c726ae0691cadc1b03b5f3726368fbdc46bff (diff) | |
| parent | 431a4a3b97f494c23e3dc7e781c2efcea63f3a7e (diff) | |
| download | frameworks_base-283be258696d9043ced4003872e0cfe109c4de66.zip frameworks_base-283be258696d9043ced4003872e0cfe109c4de66.tar.gz frameworks_base-283be258696d9043ced4003872e0cfe109c4de66.tar.bz2 | |
Merge "Add some additional debug for set operator numeric."
3 files changed, 7 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index ed0081b..9f6ec71 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -205,6 +205,8 @@ public class CDMAPhone extends PhoneBase { // Sets operator numeric property by retrieving from build-time system property String operatorNumeric = SystemProperties.get(PROPERTY_CDMA_HOME_OPERATOR_NUMERIC); + log("CDMAPhone: init set 'gsm.sim.operator.numeric' to operator='" + + operatorNumeric + "'"); setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operatorNumeric); // Sets iso country property by retrieving from build-time system property diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java index 3855515..2fefa3f 100755 --- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java +++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java @@ -329,11 +329,11 @@ public final class RuimRecords extends IccRecords { @Override protected void onAllRecordsLoaded() { - log("RuimRecords: record load complete"); - // Further records that can be inserted are Operator/OEM dependent String operator = getRUIMOperatorNumeric(); + log("RuimRecords: onAllRecordsLoaded set 'gsm.sim.operator.numeric' to operator='" + + operator + "'"); SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, operator); if (mImsi != null) { diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java index b88af2c..80988fd 100755 --- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java +++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java @@ -228,6 +228,7 @@ public class SIMRecords extends IccRecords { adnCache.reset(); + log("SIMRecords: onRadioOffOrNotAvailable set 'gsm.sim.operator.numeric' to operator=null"); SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, null); SystemProperties.set(PROPERTY_ICC_OPERATOR_ALPHA, null); SystemProperties.set(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, null); @@ -1254,12 +1255,12 @@ public class SIMRecords extends IccRecords { } protected void onAllRecordsLoaded() { - log("record load complete"); - String operator = getOperatorNumeric(); // Some fields require more than one SIM record to set + log("SIMRecords: onAllRecordsLoaded set 'gsm.sim.operator.numeric' to operator='" + + operator + "'"); SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, operator); if (imsi != null) { |