Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977db am: ce819de5b1 am: 98afac3370

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

Change-Id: Icca23eab040f996f9c42f381b8ec690a02acd8ee
This commit is contained in:
Treehugger Robot
2021-04-20 00:32:36 +00:00
committed by Automerger Merge Worker
parent c5a8d62b4b 98afac3370
commit 3c3e8f5666
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

@@ -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";

1
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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";