resolve merge conflicts of a578ae2 to stage-aosp-master am: cee0c941ed (a4b4e731) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_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_PREFER_2G_BOOL = "prefer_2g_bool";
	field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";		field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_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_PREFER_2G_BOOL = "prefer_2g_bool";
	field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";		field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_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_PREFER_2G_BOOL = "prefer_2g_bool";
	field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";		field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

deleted100644 → 0

+0 −35

Original line number	Original line	Diff line number	Diff line
	<?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>

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1978,19 +1978,6 @@
	where if the preferred is used we don't try the others. -->		where if the preferred is used we don't try the others. -->
	<bool name="config_dontPreferApn">false</bool>		<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 -->		<!-- Set to true if after a provisioning apn the radio should be restarted -->
	<bool name="config_restartRadioAfterProvisioning">false</bool>		<bool name="config_restartRadioAfterProvisioning">false</bool>