summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-03-30 16:21:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-03-30 16:21:17 +0000
commit271c9edc3039cbcabd2b7cadeead8c96bb785d8f (patch)
tree362ec4f614c05df1221da075c144444c29592776 /telephony
parent998fb1975f37881ee07a9f74d723bd742ac64363 (diff)
parent5fd843b33383266cfe5f79f7ba4c5134c104cda0 (diff)
downloadframeworks_base-271c9edc3039cbcabd2b7cadeead8c96bb785d8f.zip
frameworks_base-271c9edc3039cbcabd2b7cadeead8c96bb785d8f.tar.gz
frameworks_base-271c9edc3039cbcabd2b7cadeead8c96bb785d8f.tar.bz2
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev
automerge: 5fd843b * commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0': WiFi Calling: Show different operator name string in Data usage dialog.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/TelephonyIntents.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
index 92cd468..26faaba 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
@@ -319,6 +319,7 @@ public class TelephonyIntents {
public static final String EXTRA_PLMN = "plmn";
public static final String EXTRA_SHOW_SPN = "showSpn";
public static final String EXTRA_SPN = "spn";
+ public static final String EXTRA_DATA_SPN = "spnData";
/**
* <p>Broadcast Action: It indicates one column of a subinfo record has been changed