Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e16ba74 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from... 

Merge "Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API"" into sc-dev am: 52e885a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29b57ce61a123c5316b0a13df781a20bbf02870e
parents 8e87eab6 52e885a6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40883,6 +40883,7 @@ package android.telephony { 
  }















  public static final class CarrierConfigManager.Apn {













    field @Deprecated public static final String KEY_PREFIX = "apn.";















    field public static final String KEY_SETTINGS_DEFAULT_PROTOCOL_STRING = "apn.settings_default_protocol_string";















    field public static final String KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING = "apn.settings_default_roaming_protocol_string";















    field public static final String PROTOCOL_IPV4 = "IP";

























telephony/java/android/telephony/CarrierConfigManager.java



+8
−2




























Original line number
Diff line number
Diff line








@@ -1717,8 +1717,14 @@ public class CarrierConfigManager {













     * Configs used for APN setup.















     */















    public static final class Apn {













        /** Prefix of all Apn.KEY_* constants. */













        private static final String KEY_PREFIX = "apn.";













        /**













         * Prefix of all Apn.KEY_* constants.













         *













         * @deprecated Since KEY_PREFIX is unnecessary to public, it will modify to private













         * next android generation.













         */













        @Deprecated













        public static final String KEY_PREFIX = "apn.";































        /** IPv4 internet protocol */















        public static final String PROTOCOL_IPV4 = "IP";