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
merge in jb-release history after reset to jb-dev
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
Reconcile AOSP and GOOG jb-release

Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
Fix a logging NPE problem

bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
show 3G icon for CDMA/1xRTT

when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
frameworks/base: support devices with SoftAp that don't require firmware reload

Partial forward port from ICS.
Original Change-Id: If2db6e8ce675c3214ce645231c7a354f41ea0cc6

Change-Id: Iacb2498ec0f567a0a7c4e0dbf9127b70f09223bd
Phone: Sprint MWI Quirk: Phantom message wait indicator workaround (1/2)

Part (1/2) http://review.cyanogenmod.com/#/c/13706/

Change-Id: Iec65915475e6b8224b82feec5571f7bbded0545a
Camera : Powerkey shutter (1/3)

Allows user to take use power key to take pictures/videos

Patchset 2 : Add mask to setFlags
Patchset 3 : Rebased

Change-Id: Ic54cae422d7cf66c28d9ca778eca7931cc62c851
Framework : @Hide PREVENT_POWER_KEY

@Hide PREVENT_POWER_KEY to prevent it from entering public sdk.

Change-Id: I4fa9430d9796a9eac7273398092dfc9b5cc54d84
Merge tag 'android-4.1.1_r6' into 411r6_merge

Android 4.1.1 release 6
Framework : Hide PREVENT_POWER_KEY permission

@Hide PREVENT_POWER_KEY permission to prevent it from entering public sdk.

Change-Id: I9955ed17942db5a7f179c2efc97b5b1e563926e2
Framework: hide updateStringCache from public api

*added by theme-chooser merge db0ef43

Change-Id: Id63ff5c6fa77ea7234c1800b60f3ffb32a436bea
Merge remote branch 'remotes/upstream/jellybean' into pdroid