summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-09-08 23:54:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-08 23:54:31 +0000
commit07018456d92a9c14b12dca3368e8b893d136d5fb (patch)
treeed15d92868f10c68f146d98f03ea1ea4ce6726e0 /telephony/java/com
parent09687e24639474b67e944f7672759f6796933f0d (diff)
parent8a4537ba2328a47626e1b5a66f1c57a15de4f844 (diff)
downloadframeworks_base-07018456d92a9c14b12dca3368e8b893d136d5fb.zip
frameworks_base-07018456d92a9c14b12dca3368e8b893d136d5fb.tar.gz
frameworks_base-07018456d92a9c14b12dca3368e8b893d136d5fb.tar.bz2
am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev
* commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c': change the property name about IDP from 'telephony.' to 'gsm.'
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/TelephonyProperties.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
index 34992b8..c89208d 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java
@@ -124,7 +124,7 @@ public interface TelephonyProperties
static final String PROPERTY_ECM_EXIT_TIMER = "ro.cdma.ecmexittimer";
/** the international dialing prefix of current operator network */
- static final String PROPERTY_OPERATOR_IDP_STRING = "telephony.operator.idpstring";
+ static final String PROPERTY_OPERATOR_IDP_STRING = "gsm.operator.idpstring";
/**
* Defines the schema for the carrier specified OTASP number