summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-06-15 16:29:43 -0700
committerJohn Wang <johnwang@google.com>2011-06-15 16:33:41 -0700
commitf4a9e1a8a4e1bbefd5dbd16562e192a1f8ef23e1 (patch)
tree076f721796e51a3fdd37598b2accf4cc36645243 /telephony
parentf4b56eaaba388d1503e24e7a5a7b3bed04602bd8 (diff)
downloadframeworks_base-f4a9e1a8a4e1bbefd5dbd16562e192a1f8ef23e1.zip
frameworks_base-f4a9e1a8a4e1bbefd5dbd16562e192a1f8ef23e1.tar.gz
frameworks_base-f4a9e1a8a4e1bbefd5dbd16562e192a1f8ef23e1.tar.bz2
Don't clean up operator properties in RuimRecords.
Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA devices have RUIM, these properties should keep the original values, e.g. build time settings, when there is no RUIM but set new values when RUIM is available and loaded. bug:4552029 Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/cdma/RuimRecords.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
index ee63ede..9af2d26 100755
--- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
+++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
@@ -119,8 +119,11 @@ public final class RuimRecords extends IccRecords {
adnCache.reset();
- phone.setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, null);
- phone.setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, null);
+ // Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and
+ // PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA
+ // devices have RUIM, these properties should keep the original
+ // values, e.g. build time settings, when there is no RUIM but
+ // set new values when RUIM is available and loaded.
// recordsRequested is set to false indicating that the SIM
// read requests made so far are not valid. This is set to