diff --git a/core/res/res/values-mcc310-mnc030/config.xml b/core/res/res/values-mcc310-mnc030/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc030/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc070/config.xml b/core/res/res/values-mcc310-mnc070/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc070/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc170/config.xml b/core/res/res/values-mcc310-mnc170/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc170/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc280/config.xml b/core/res/res/values-mcc310-mnc280/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc280/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc380/config.xml b/core/res/res/values-mcc310-mnc380/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc380/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml index 53e4193c7f38d..d76b9be324a63 100644 --- a/core/res/res/values-mcc310-mnc410/config.xml +++ b/core/res/res/values-mcc310-mnc410/config.xml @@ -23,8 +23,4 @@ 1410 - - - true - diff --git a/core/res/res/values-mcc310-mnc560/config.xml b/core/res/res/values-mcc310-mnc560/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc560/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc310-mnc950/config.xml b/core/res/res/values-mcc310-mnc950/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc310-mnc950/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc311-mnc180/config.xml b/core/res/res/values-mcc311-mnc180/config.xml deleted file mode 100644 index 26b9192e0cc3b..0000000000000 --- a/core/res/res/values-mcc311-mnc180/config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - true - - diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml index 336e30e45b006..db2f8d01f93a9 100755 --- a/core/res/res/values-mcc311-mnc480/config.xml +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -40,7 +40,4 @@ true - - true - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index c02a1973f97b2..d34789102aa87 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4225,10 +4225,6 @@ only. The component must be part of a system app. --> - - false - 2000000 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 59605acf27785..c18af77c1d922 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3826,7 +3826,6 @@ - diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b09b850c6c1e4..cb9464020c131 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1086,7 +1086,7 @@ public class CarrierConfigManager { /** * Flag specifying if we should interpret all signal strength as one bar higher - * This is a replacement for the resource config_inflateSignalStrength + * This is a replacement for the former resource config_inflateSignalStrength * The default value is false. * @hide */