Introduce a new config item: config_lte_capable

config_lte_capable is set to true when the device is
LTE capable.

CRs-Fixed: 628506

Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
Change-Id: I0032ff41a37509eb0acf25f1ee08de6cbd01511e
Add config to send SMS on 1x

When UE is attached to eHRPD network, IMS is registered and
there is an active 1xRTT voice call, the config determines
whether to send SMS over 1x. Default value is true

CRs-Fixed: 565247

Conflicts:
core/res/res/values/symbols.xml
Change-Id: Ie4e00eb57ef439e9383c616cd1b60108bcfd505f
UsbSettings: Add UMS mode support.

Add Usb Mass storage mode support for Android device;
Fix SD card can not be mounted to device when usb cable
is plugged in or unplugged fast and frequently.

Change-Id: I3e2df57be0d24909d4ec3cbe6590a576976a324c
core: jni: fix memory leak in SoundTrigger JNI

jExtras object created in android_hardware_SoundTrigger
JNISoundTriggerCallback::onRecognitionEvent()
is not deleted causing a memory which depletes JNI
JNI local storage during back-to-back SoundTrigger
detections.
Delete jExtra after storing in return object.

Change-Id: Ib7048917b7538a27d4519504b30252879acc5447
CRs-fixed: 733969
SystemUI: Update the service state of NetworkController

MSimNetworkController doesn't update NetworkController.mServiceState when
service state changes, so mServiceState always point to the old object.

Update mServiceState to make sure NetworkController check emergency call
only state correctly.

CRs-Fixed: 708875

Change-Id: Iacfdb20831459e1afc50c9b957543fcd5d62e04c
Store Network Mode selected in subId Table.

Modify code to store network selected by user in
subId table.

Change-Id: I3175de81ddde64e496192909ef9e5dd079646bc9
Statusbar: Show wifi status when wifi enabled

Now, Wifi status is only shown on StatusBar when connected to AP.
To satisfy the security requirement, we need show wifi status when
AppOps enabled.

Change-Id: Iae803025e17fd7fb90931f39e8f9841b659ed8ee
StatusBar: Add customized data activity icons

Add customized icons for China Mobile.

Change-Id: I9b4e2ef2d619a877291d45137d3d15a6362d96ea
CRs-Fixed: 731551
base: App crash when select suggestion's length more than specified.

App crashed by catch IndexOutOfBoundsException which raised
by check span range when select suggested string.The root
cause is that the editor will truncate the suggested string
which length is more than it specified, but it also set span
use the suggestion's original length.

Update the suggestion's real length after editor replace the
original string to suggested.

Change-Id: I2d765701934a9e68be172cb87a104590f3cdeceb
CRs-Fixed: 532211
Telecomm: Use proper bit for Voice privacy

in new code, DISCONNECT_FROM_CONFERENCE is introduced newly and is using
same bit as voice privacy and hence disconnect option not showing up
for conference. Hence use a different bit for voice privacy

CRs-Fixed: 738068
Change-Id: I80b7ae7b24ac096dc5bf5abd044bcd8020d06c1d
Media process is crashing with NullPointer exception

Sometime, while creating thumnails list of media files in
compose MMS->attach file,  filepath may be null due to
synchronization issue.
Adding NULL check to avoid NUllPointer exception.

Change-Id: Id6cf5612a959b3ae15b44bc60dbbcbe40c624f09
CRs-Fixed: 636494
Add looper to the thread to fix system_server crash

Toast message internally creates handler and we can't create
handler inside thread that has not called Looper.prepare().
Thus, we added looper to the thread to avoid system_server
carsh.

Change-Id: I09b9c4923c109f0b2707f8346e091efbd24b5089
CRs-Fixed: 669467
Remove opaque check in preparing dirty region

Since preserve swap is enabled, we need to clear the color buffer
when the scissor rect is prepared for a new process. This prevents
garbage being present from the previous process in the color buffer.

CRs-Fixed: 549755

Conflicts:
	libs/hwui/OpenGLRenderer.cpp

Change-Id: Icd12ae388077b8c9ed329c37314e896500078543
AlarmManager: Set RTC_POWEROFF_WAKEUP as hidden alarm type

Hide RTC_POWEROFF_WAKEUP type to avoid any conflict with android
CDD.

Change-Id: I13a01f133a1aab2a68b32e92fc91801ceb7d43c7
Add reboot reason to detect device shutdown

This change will detect silent device shutdown

Change-Id: Ia3c13e372b02dd4d3ec4a99d1c1f7c4787977ac3
Applications crash observed while selecting words from suggestion list

While selecting words from suggestion list, applications are crashing as
textview span are going out of index. For textinput where spaces are not
allowed length difference shall be calculated properly to avoid Index
out of bound situations.

Change-Id: I360318cf9241abbb7f58ad1ddf3f3c8d364f17d1
CRs-Fixed: 642057
Telephony: Add TD-SCDMA network modes

1) TD-SCDMA Signal Strength support.
2) Add TD-SCDMA to the list of supported network modes.

CRs-Fixed: 403258, 479310

Conflicts:
telephony/java/android/telephony/SignalStrength.java
Change-Id: I158821574484bfaf47d1660406e591e2afb3be5e
Telephony(MSIM): Add support for MultiSim.

--> Subscription specific for Mobile data, roaming and usage
     - Provide database flags as per subscription for both Mobile
       data and Data roaming options.

--> Add sub based API for getAllCellInfo in TelephonyManager.

--> Use Dds subId to get Sim state, roaming state in NetworkPolicyService.

Change-Id: I6ee5d2a22e44fe7d0d68a41af0481ddbbbe21c3f
Compilation fix for AOSP update

Fixed systemui and device crash on bootup in msim mode

Conflicts:
services/core/java/com/android/server/ConnectivityService.java
Change-Id: Idf836ec01e18f8e64c972e3a54b279618e4d6ed6
Bluetooth: Changes for LPP

This patch includes implementation of a new Bluetooth
Adapter named QBluetoothAdapter for implementing LE
specific tasks that the default adapter doesnt perform.
This patch also implements Low power proximity.

CRs-Fixed: 581289

Conflicts:
	services/core/java/com/android/server/BluetoothManagerService.java

Change-Id: I63e0593f79c8929d4e18cee0472fcb401c8892e7