diff options
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/ApnSetting.java | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6c1ba1afc073..f0cc30b19700 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5017,6 +5017,4 @@ the wallpaper at full brightness. 1 displays the wallpaper as fully black. --> <item name="config_wallpaperDimAmount" format="float" type="dimen">0.05</item> - <!-- 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 b0153583c081..9e091fdd5f85 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4427,5 +4427,4 @@ <java-symbol type="dimen" name="config_wallpaperDimAmount" /> - <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 d42f5bbd6d20..442681ee71b2 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -2228,7 +2228,7 @@ public class ApnSetting implements Parcelable { /** * Builds {@link ApnSetting} from this builder. * - * @return {@code null} if {@link #setEntryName(String)} + * @return {@code null} if {@link #setApnName(String)} or {@link #setEntryName(String)} * is empty, or {@link #setApnTypeBitmask(int)} doesn't contain a valid bit, * {@link ApnSetting} built from this builder otherwise. */ @@ -2236,7 +2236,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(mEntryName)) { + || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { return null; } return new ApnSetting(this); |