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

Commit 3c3e8f56 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... 

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

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

Change-Id: Icca23eab040f996f9c42f381b8ec690a02acd8ee
parents c5a8d62b 98afac33

core/api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -11108,10 +11108,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_AVOID_5GHZ_SOFTAP_FOR_LAA_BOOL = "wifi.avoid_5ghz_softap_for_laa_bool";















    field public static final String KEY_AVOID_5GHZ_WIFI_DIRECT_FOR_LAA_BOOL = "wifi.avoid_5ghz_wifi_direct_for_laa_bool";

























telephony/java/android/telephony/CarrierConfigManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -4216,7 +4216,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";