diff options
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/ApnSetting.java | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index deb00c1c9a40..57f32eeed9d6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4892,4 +4892,7 @@ <bool name="config_supportsMicToggle">false</bool> <!-- Whether this device is supporting the camera toggle --> <bool name="config_supportsCamToggle">false</bool> + + <!-- Configure emergency apn --> + <string name="config_emergency_apn" translatable="false">sos</string> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 3c59a6403f10..d47bb247ae67 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4386,4 +4386,6 @@ <java-symbol type="bool" name="config_supportsMicToggle" /> <java-symbol type="bool" name="config_supportsCamToggle" /> + + <java-symbol type="string" name="config_emergency_apn" /> </resources> diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index ed181628554a..7e84b372ae83 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -2224,7 +2224,7 @@ public class ApnSetting implements Parcelable { /** * Builds {@link ApnSetting} from this builder. * - * @return {@code null} if {@link #setApnName(String)} or {@link #setEntryName(String)} + * @return {@code null} if {@link #setEntryName(String)} * is empty, or {@link #setApnTypeBitmask(int)} doesn't contain a valid bit, * {@link ApnSetting} built from this builder otherwise. */ @@ -2232,7 +2232,7 @@ public class ApnSetting implements Parcelable { if ((mApnTypeBitmask & (TYPE_DEFAULT | TYPE_MMS | TYPE_SUPL | TYPE_DUN | TYPE_HIPRI | TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX | TYPE_XCAP | TYPE_VSIM | TYPE_BIP | TYPE_ENTERPRISE)) == 0 - || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { + || TextUtils.isEmpty(mEntryName)) { return null; } return new ApnSetting(this); |