summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-06-02 18:24:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 18:24:28 -0700
commit147510145f7b619f86a71065f2d62f444aee7f3d (patch)
treed6a41343810ad4e64ba41cceeedffd386709eb06 /telephony/java/android
parentade2a5467c8f6fbb115df6a1e5730758db4e620c (diff)
parent2e543dc188c3c2e8f8a785e403c95b7e22fa6262 (diff)
downloadframeworks_base-147510145f7b619f86a71065f2d62f444aee7f3d.zip
frameworks_base-147510145f7b619f86a71065f2d62f444aee7f3d.tar.gz
frameworks_base-147510145f7b619f86a71065f2d62f444aee7f3d.tar.bz2
am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262': CdmaLte: Use SPN from SIM card if SIM card is presend
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/ServiceState.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index ba05837..2aa6d1d 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -551,7 +551,7 @@ public class ServiceState implements Parcelable {
*
* @hide
*/
- public void setCdmaEriText(String longName) {
+ public void setOperatorAlphaLong(String longName) {
mOperatorAlphaLong = longName;
}