From 251c44a49a075d664b2b1b81977e4b43b6741b43 Mon Sep 17 00:00:00 2001
From: tom hsu <tomhsu@google.com>
Date: Sat, 20 Feb 2021 17:23:31 +0800
Subject: [PATCH] Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX
 from API"

This reverts commit 72f1472aaca88045078b6b296ddae2819377a339.

Reason for revert: b/174645163#6

Bug: 174645163
Test: build passed
Change-Id: Ied3c6af8b9d03629e3abd377ad032d9e4bb35fd8
---
 core/api/current.txt                                   |  1 +
 .../java/android/telephony/CarrierConfigManager.java   | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 3b5e1087869e8..b7ecc289e4d40 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -40788,6 +40788,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";
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 6d3fa81a856d0..ef2183ae8cd10 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -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";