AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger. (04e71b3d) · Commits · e / os / android_frameworks_base

Android.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -122,8 +122,8 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/gsm/ISimPhoneBook.aidl \
		telephony/java/com/android/internal/telephony/gsm/ISms.aidl \
		telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl

		@@ -438,3 +438,5 @@ include $(BUILD_JAVA_LIBRARY)
		ifeq (,$(ONE_SHOT_MAKEFILE))
		include $(call first-makefiles-under,$(LOCAL_PATH))
		endif

api/current.xml

+86 −64

Original line number	Diff line number	Diff line
		@@ -10263,6 +10263,28 @@
		visibility="public"
		>
		</field>
		<field name="stat_sys_vp_phone_call"
		type="int"
		transient="false"
		volatile="false"
		value="17302061"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="stat_sys_vp_phone_call_on_hold"
		type="int"
		transient="false"
		volatile="false"
		value="17302062"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="stat_sys_warning"
		type="int"
		transient="false"
		@@ -97845,7 +97867,7 @@
		abstract="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="divideMessage"
		@@ -97854,8 +97876,8 @@
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="text" type="java.lang.String">
		@@ -97867,8 +97889,8 @@
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -97878,8 +97900,8 @@
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="destinationAddress" type="java.lang.String">
		@@ -97901,8 +97923,8 @@
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="destinationAddress" type="java.lang.String">
		@@ -97922,8 +97944,8 @@
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="destinationAddress" type="java.lang.String">
		@@ -97944,7 +97966,7 @@
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -97955,7 +97977,7 @@
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -97966,7 +97988,7 @@
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -97977,7 +97999,7 @@
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -97988,7 +98010,7 @@
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -97999,7 +98021,7 @@
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98010,7 +98032,7 @@
		value="5"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98021,7 +98043,7 @@
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98032,7 +98054,7 @@
		value="7"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98042,14 +98064,14 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<constructor name="SmsMessage"
		type="android.telephony.gsm.SmsMessage"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</constructor>
		@@ -98060,7 +98082,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="messageBody" type="java.lang.CharSequence">
		@@ -98075,7 +98097,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="messageBody" type="java.lang.String">
		@@ -98090,7 +98112,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="pdu" type="byte[]">
		@@ -98103,7 +98125,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98114,7 +98136,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98125,7 +98147,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98136,7 +98158,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98147,7 +98169,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98158,7 +98180,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98169,7 +98191,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98180,7 +98202,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98191,7 +98213,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98202,7 +98224,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98213,7 +98235,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98224,7 +98246,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98235,7 +98257,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98246,7 +98268,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98257,7 +98279,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="scAddress" type="java.lang.String">
		@@ -98276,7 +98298,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="scAddress" type="java.lang.String">
		@@ -98297,7 +98319,7 @@
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="pdu" type="java.lang.String">
		@@ -98310,7 +98332,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98321,7 +98343,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98332,7 +98354,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98343,7 +98365,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98354,7 +98376,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98365,7 +98387,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98376,7 +98398,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98387,7 +98409,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98398,7 +98420,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98409,7 +98431,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -98420,7 +98442,7 @@
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98431,7 +98453,7 @@
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98442,7 +98464,7 @@
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98453,7 +98475,7 @@
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98464,7 +98486,7 @@
		value="140"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98475,7 +98497,7 @@
		value="160"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98486,7 +98508,7 @@
		value="153"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98496,7 +98518,7 @@
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="valueOf"
		@@ -98529,14 +98551,14 @@
		abstract="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<constructor name="SmsMessage.SubmitPdu"
		type="android.telephony.gsm.SmsMessage.SubmitPdu"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</constructor>
		@@ -98547,7 +98569,7 @@
		value="null"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -98558,7 +98580,7 @@
		value="null"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>

core/java/android/net/MobileDataStateTracker.java

+40 −30

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		public String getTcpBufferSizesPropName() {
		String networkTypeStr = "unknown";
		TelephonyManager tm = new TelephonyManager(mContext);
		//TODO We have to edit the parameter for getNetworkType regarding CDMA
		switch(tm.getNetworkType()) {
		case TelephonyManager.NETWORK_TYPE_GPRS:
		networkTypeStr = "gprs";
		@@ -253,6 +254,15 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		case TelephonyManager.NETWORK_TYPE_UMTS:
		networkTypeStr = "umts";
		break;
		case TelephonyManager.NETWORK_TYPE_CDMA:
		networkTypeStr = "cdma";
		break;
		case TelephonyManager.NETWORK_TYPE_EVDO_0:
		networkTypeStr = "evdo";
		break;
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		networkTypeStr = "evdo";
		break;
		}
		return "net.tcp.buffersize." + networkTypeStr;
		}

core/java/android/provider/Checkin.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ public final class Checkin {
		BROWSER_SNAP_CENTER,
		BROWSER_TEXT_SIZE_CHANGE,
		BROWSER_ZOOM_OVERVIEW,

		CRASHES_REPORTED,
		CRASHES_TRUNCATED,
		ELAPSED_REALTIME_SEC,
		@@ -181,6 +182,9 @@ public final class Checkin {
		MARKET_REASON_PARSE_MANIFEST_EMPTY,
		MARKET_REASON_UNKNOWN,
		MARKET_STALE_INSTALL_ATTEMPT,
		PHONE_CDMA_REGISTERED,
		PHONE_CDMA_DATA_ATTEMPTED,
		PHONE_CDMA_DATA_CONNECTED,
		}
		}

		@@ -347,3 +351,6 @@ public final class Checkin {
		}
		}
		}

core/java/android/provider/Settings.java

+69 −4

Original line number	Diff line number	Diff line
		@@ -2049,6 +2049,70 @@ public final class Settings {
		* @hide pending API council
		*/
		public static final String BACKGROUND_DATA = "background_data";

		/**
		* The CDMA roaming mode 0 = Home Networks, CDMA default
		* 1 = Roaming on Affiliated networks
		* 2 = Roaming on any networks
		* @hide
		*/
		public static final String CDMA_ROAMING_MODE = "roaming_settings";

		/**
		* The CDMA subscription mode 0 = RUIM/SIM (default)
		* 1 = NV
		* @hide
		*/
		public static final String CDMA_SUBSCRIPTION_MODE = "subscription_mode";

		/**
		* represents current active phone class
		* 1 = GSM-Phone, 0 = CDMA-Phone
		* @hide
		*/
		public static final String CURRENT_ACTIVE_PHONE = "current_active_phone";

		/**
		* The preferred network mode 7 = Global, CDMA default
		* 4 = CDMA only
		* 3 = GSM/UMTS only
		* @hide
		*/
		public static final String PREFERRED_NETWORK_MODE =
		"preferred_network_mode";

		/**
		* CDMA Cell Broadcast SMS
		* 0 = CDMA Cell Broadcast SMS disabled
		* 1 = CDMA Cell Broadcast SMS enabled
		* @hide
		*/
		public static final String CDMA_CELL_BROADCAST_SMS =
		"cdma_cell_broadcast_sms";

		/**
		* The cdma subscription 0 = Subscription from RUIM, when available
		* 1 = Subscription from NV
		* @hide
		*/
		public static final String PREFERRED_CDMA_SUBSCRIPTION =
		"preferred_cdma_subscription";

		/**
		* Whether the enhanced voice privacy mode is enabled.
		* 0 = normal voice privacy
		* 1 = enhanced voice privacy
		* @hide
		*/
		public static final String ENHANCED_VOICE_PRIVACY_ENABLED = "enhanced_voice_privacy_enabled";

		/**
		* Whether the TTY mode mode is enabled.
		* 0 = disabled
		* 1 = enabled
		* @hide
		*/
		public static final String TTY_MODE_ENABLED = "tty_mode_enabled";
		}

		/**
		@@ -3127,13 +3191,13 @@ public final class Settings {
		throw new RuntimeException("this should never happen");
		}

		String imei = TelephonyManager.getDefault().getDeviceId();
		if (TextUtils.isEmpty(imei)) {
		String deviceId = TelephonyManager.getDefault().getDeviceId();
		if (TextUtils.isEmpty(deviceId)) {
		return "";
		}

		byte[] hashedImei = digest.digest(imei.getBytes());
		String id = new String(Base64.encodeBase64(hashedImei), 0, 12);
		byte[] hashedDeviceId = digest.digest(deviceId.getBytes());
		String id = new String(Base64.encodeBase64(hashedDeviceId), 0, 12);
		id = id.replaceAll("/", "_");
		sJidResource = JID_RESOURCE_PREFIX + id;
		return sJidResource;
		@@ -3152,3 +3216,4 @@ public final class Settings {
		return "android-" + Long.toHexString(androidId);
		}
		}