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

Commit 98afac33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977 am: ce819de5 

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

Change-Id: I397d86b1d403451cf0de301ac246b0af3a9f3eba
parents 0f2e5f50 ce819de5

core/api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -9461,10 +9461,6 @@ package android.telephony { 
    field public static final String KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL = "support_cdma_1x_voice_calls_bool";

  }













  public static final class CarrierConfigManager.Ims {













    field public static final String KEY_PUBLISH_SERVICE_DESC_FEATURE_TAG_MAP_OVERRIDE_STRING_ARRAY = "ims.publish_service_desc_feature_tag_map_override_string_array";













  }



























  public static final class CarrierConfigManager.Wifi {















    field public static final String KEY_HOTSPOT_MAX_CLIENT_COUNT = "wifi.hotspot_maximum_client_count";















    field public static final String KEY_PREFIX = "wifi.";

























telephony/java/android/telephony/CarrierConfigManager.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -4043,7 +4043,6 @@ public class CarrierConfigManager {













         * it will override the framework default.















         * @hide















         */













        @SystemApi















        public static final String KEY_PUBLISH_SERVICE_DESC_FEATURE_TAG_MAP_OVERRIDE_STRING_ARRAY =















                KEY_PREFIX + "publish_service_desc_feature_tag_map_override_string_array";