Fix our interpretation of apn setting's bearer.

Between ICS and JB we changed it to use TelephonyManager's network type
enumeration.  This changes it back to represent the RIL's radio
technology.  The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
Fix detection of CDMA cell broadcast messages.

The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.

Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
Implement CMAS service category program results.

Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
Fix 6804479: "Emergency calls only" in notification shade

Add an additional codepath to the "no connectivity" logic in
NetworkController to allow the PLMN bubble up from the
GsmServiceStateTracker, where R.string.emergency_calls_only
is returned if we're in emergency call mode.

Bug: 6804479
Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
Fix NPE on some phones at startup.

Bug: 6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
Poll for DATA_REGISTRATION_STATE on SVDO devices (3G icon fix).

When both voice and data are active, SVDO devices return
RADIO_TECHNOLOGY_1xRTT for VOICE_REGISTRATION_STATE, and
RADIO_TECHNOLOGY_EVDO_A (or equivalent) for DATA_REGISTRATION_STATE.  So
both states must be polled to determine "which" radio technology is in use
(although they technically both are).  Otherwise only 1xRTT is reported.

Note: This bug was masked for a while as the PREFERRED_NETWORK_MODE
defaults to NETWORK_MODE_GLOBAL in PhoneFactory, which is another,
preexisting circumstance for polling DATA_REGISTRATION_STATE.  Thus, the
bug would trigger upon opening "Mobile network setings", when the radio is
queried for its PREFERRED_NETWORK_TYPE the first time.

Change-Id: I80456a7a1f2136a2ee68b54137dbafd4db8e202b
frameworks/base: Increase Zygote preload GC threshold.

Increase Zygote preload GC threshold to half of the heapgrowthlimit,
to reduce boot up time.

Change-Id: I74a68a512c2266ac6e62f09f361f8607251ca9a7
ActivityTrigger:  New class to invoke when activity starts/resumes

Change-Id: Ib57aa4d3767e27b5bba658b27e084fc3ef042c36
Merge "frameworks/base: Increase Zygote preload GC threshold." into jellybean
Merge "ActivityTrigger:  New class to invoke when activity starts/resumes" into jellybean
Merge branch 'jb-release' of https://android.googlesource.com/platform/frameworks/base into aosp

Conflicts:
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

Change-Id: I7d199cab1bf8b69b94771ff6e241ae53520e0e8b
Fix mergefail

Change-Id: I98224af1c24a9181e512507c8ad6bfa4542c2618
Add the capability to set GC paramter system wide or per app level

Set system wide default value for xhdpi-1024 device.

Change-Id: I2eeaeebdea8e023d1eab15aad9dd53cb3ecec3a1
Merge remote branch 'upstream/jellybean' into jellybean