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

resolve merge conflicts of a578ae2 to stage-aosp-master

Browse Source 
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
This commit is contained in:
Jordan Liu
2016-11-30 10:04:11 -08:00
parent ad299d38ff a578ae2aa1
commit cee0c941ed
7 changed files with 20 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -36861,6 +36861,7 @@ package android.telephony {
field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";
field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";
field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";
field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

1
api/system-current.txt
View File

@@ -39950,6 +39950,7 @@ package android.telephony {
field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";
field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";
field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";
field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

1
api/test-current.txt
View File

@@ -36943,6 +36943,7 @@ package android.telephony {
field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";
field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";
field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";
field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

35
core/res/res/values-mcc259-mnc05/config.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The list of ril radio technologies (see ServiceState.java) which only support
a single data connection at one time. This may change by carrier via
overlays (some don't support multiple pdp on UMTS). All unlisted radio
tech types support unlimited types (practically only 2-4 used). -->
<integer-array name="config_onlySingleDcAllowed">
<item>1</item> <!-- GPRS -->
<item>2</item> <!-- EDGE -->
<item>3</item> <!-- UMTS -->
<item>9</item> <!-- HSDPA -->
<item>10</item> <!-- HSUPA -->
<item>11</item> <!-- HSPA -->
<item>14</item> <!-- LTE -->
<item>15</item> <!-- HSPAP -->
</integer-array>
</resources>

13
core/res/res/values/config.xml
View File

@@ -1956,19 +1956,6 @@
where if the preferred is used we don't try the others. -->
<bool name="config_dontPreferApn">false</bool>
<!-- The list of ril radio technologies (see ServiceState.java) which only support
a single data connection at one time. This may change by carrier via
overlays (some don't support multiple pdp on UMTS). All unlisted radio
tech types support unlimited types (practically only 2-4 used). -->
<integer-array name="config_onlySingleDcAllowed">
<item>4</item> <!-- IS95A -->
<item>5</item> <!-- IS95B -->
<item>6</item> <!-- 1xRTT -->
<item>7</item> <!-- EVDO_0 -->
<item>8</item> <!-- EVDO_A -->
<item>12</item> <!-- EVDO_B -->
</integer-array>
<!-- Set to true if after a provisioning apn the radio should be restarted -->
<bool name="config_restartRadioAfterProvisioning">false</bool>

1
core/res/res/values/symbols.xml
View File

@@ -1665,7 +1665,6 @@
<java-symbol type="array" name="config_testLocationProviders" />
<java-symbol type="array" name="config_defaultNotificationVibePattern" />
<java-symbol type="array" name="config_notificationFallbackVibePattern" />
<java-symbol type="array" name="config_onlySingleDcAllowed" />
<java-symbol type="bool" name="config_useNewSensorSamplesForDoze" />
<java-symbol type="bool" name="config_useAttentionLight" />
<java-symbol type="bool" name="config_animateScreenLights" />

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

@@ -208,6 +208,14 @@ public class CarrierConfigManager {
public static final String
KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";
/**
* List of RIL radio technologies (See {@link ServiceState} {@code RIL_RADIO_TECHNOLOGY_*}
* constants) which support only a single data connection at a time. Some carriers do not
* support multiple pdp on UMTS.
*/
public static final String
KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";
/**
* Override the platform's notion of a network operator being considered roaming.
* Value is string array of MCCMNCs to be considered roaming for 3GPP RATs.
@@ -1117,6 +1125,15 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
new String[]{"default", "mms", "dun", "supl"});
sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,
new int[]{
4, /* IS95A */
5, /* IS95B */
6, /* 1xRTT */
7, /* EVDO_0 */
8, /* EVDO_A */
12 /* EVDO_B */
});
sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null);