Squashed commit of the following:

commit bf5a4d89439267f6e0268a30a3be3f2a7d60f4ef
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Oct 8 16:37:21 2013 -0700

    Fix compilation after upstream merge

    Change-Id: Ifde1ee07d3968b16af7ccc311b0ed615931ea921

commit f62496990490353f36a0a353ced7891b77e9ddfc
Author: Sudheer Reddy Yampalla <syampa@codeaurora.org>
Date:   Tue Mar 19 11:35:45 2013 +0530

    Telephony: Add support for tune away and priority sub

    Add constants for tune away and priority subscription
    CRs-fixed: 464483

    Change-Id: I790cfdcd9a1dee946502349084a4d8138d2144ec

commit 37b6d7fb64c873ec12dc08b6bc8b4d57768a32c0
Author: Chaitanya Saggurthi <csaggurt@codeaurora.org>
Date:   Thu Jul 4 20:22:08 2013 +0530

    Telephony(MSIM): Add prompt support for SMS

    1) Add prompt option in SMS multi sim settings.
    2) New iterface API to get SMS prompt is enabled or not.
    3) Disply prompt while sending SMS, if user selects
       prompt mode in multi sim settings.
    CRs-fixed: 474694

    Change-Id: Iea9e8a4ea4f413316604a3d66ece624eab75ee26

commit a69d6c40748fd3e64c468ad000592688899c1a70
Author: Banavathu Srinivas Naik <snb@codeaurora.org>
Date:   Mon Nov 26 17:55:50 2012 +0530

    Frameworks: Do not send Radio Power Off on SIM_RESET

    Changes made to not to send radio power off during refresh app
    reset.

    Change-Id: I83b7063a86ce9b380c7aeb0c140a4967d205d93b
    CRs-Fixed: 441924
    Conflicts:
    	core/res/res/values/symbols.xml

commit a6c7dcedabf4a92b33a4aaa3ebb22074676960dc
Author: Narsinga Rao Chella <nrchella@codeaurora.org>
Date:   Tue Aug 13 16:56:09 2013 -0700

    frameworks/base: Add support for QCHAT concurrencies.

    - Add setParameters() support in Audio Service.
    - Handle audio focus for QCHAT to support concurrencies
    with telephony calls and music player.

    Change-Id: I2c317948c3b1c508f07787d473d40fb9a09f4b91

commit f60d36474dc36ab542b8d9b6d50f2ab89a338b1a
Author: Krishnankutty Kolathappilly <kkolat@codeaurora.org>
Date:   Tue Apr 30 18:41:48 2013 -0700

    frameworks/base: Add wifi display to fixed volume devices

    Wifi display should be treated as device with fixed volume like HDMI.
    User should not be able to change the volume on device. Volume
    change should be supported only on the end device
    CRs-Fixed: 480334

    Change-Id: I2e41e9aef01167d1bdca3bca09ed863834dae1d8

commit cf72e39a556cce256ffae7a95028e136ec415cc3
Author: SanthoshHE <skhara@codeaurora.org>
Date:   Tue Jul 23 11:25:43 2013 +0530

    media: Configure audio encode parameters only for valid audio codec

    Added extra check for audio codec in profile

    Change-Id: Idc83bcc6d77361bd298bbff3eee1d0132e5498ea
    CRs-fixed: 513887

commit 4d46205cad07da19873e3a166a3ebbb8a2ea9e81
Author: Vidyakumar Athota <vathota@codeaurora.org>
Date:   Tue Jul 30 11:33:08 2013 -0700

    frameworks/base: Add support for QCHAT call.

    - Add VSID for QCHAT.
    - Add a key which can be used with getParameters()
    to query all call states.

    Change-Id: If7be9467013700b220c9b10c6236a99d56f7a8cc

commit 084877b1abe069e93f9240eb8df50d8822541d62
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Tue Mar 26 12:18:53 2013 -0700

    audio: Manage audio focus for QCHAT

    - Cherry-picked from the commit with commit ID:
    c14c6156e879ec1c3f83f6a2cc31dac1d22147a2
    - FR-fixed: 8965

    Change-Id: I51c554b82c6177b7d3e845bdc8970825b5d1198a

commit 737ff0b2188378c30e31ff6200a7ad1e641ca1c7
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Wed Jun 5 11:55:46 2013 -0700

    frameworks/base: Add constants for call_state and vsid

    For DSDA, CallManager will call setParameters() to indicate
    the call state changes between CS Multimode call,
    CS GSM only call and IMS Multimode. Add constants for
    call_state and vsid keys. Add pre-defined VSID and call
    state constants.

    Change-Id: I6add5f13d4a2ad5eacdf0750bbd402128d86f7cd

commit 421562923b8479e8bec44b2816e5940cde132665
Author: Alex Yakavenka <ayakav@codeaurora.org>
Date:   Mon Aug 26 12:49:03 2013 -0700

    Add onDataRatChanged trigger to DcTracker

    It is required to reload apns when data rat switches from
    gsm to cdma

    Change-Id: Ifdb04d0c8be325a226dbc707a3fa8c8c697089fa
    CRs-Fixed: 530277

commit a781753a22ce63be776bfb582267f457f104867a
Author: Sandeep Gutta <sangutta@codeaurora.org>
Date:   Wed Aug 21 14:09:13 2013 +0530

    Telephony(MSIM): Define invalid subscription constant

    Define a new constant for invalid subscription id.

    Change-Id: I7bc433d5f24c70b710cde7ef5ac362b7ee945d2d
    CRs-Fixed: 529780

commit 4d88cdbf30ba48101d539cb42f129c77f7e69b4e
Author: Sandeep Kunta <skunta@codeaurora.org>
Date:   Sat Aug 10 20:55:38 2013 +0530

    Telephony: Add support for NETWORK_TYPE_GSM

    Add support for NETWORK_TYPE_GSM in TelephonyManager and
    corresponding mapping in ServicState.java so that when
    application queries getVoiceNetworkType() and currently
    camped rat is GSM, they get network mode as GSM instead
    of network mode unknown.

    Change-Id: I5e971c625532696776b9555ad8cfd85eba4fc423
    CRs-Fixed: 526435

commit b9ba4718017262eaea8c1af85596a0d07266acd5
Author: Suresh Koleti <skolet@codeaurora.org>
Date:   Fri Jan 25 13:34:28 2013 +0530

    Telephony(MultiSim): Add support for emergency calls

    Populate ecclist by reading ril.ecclist corresponds to
    each subscription.
    If dialed number is present in consolidated ecclist then
    mark as emergency number.

    Change-Id: Ibba48a930e29dac0d80d0c8add2e01214a9bf9c3
    CRs-fixed: 445415

commit 7c514bc96b3227577ec829072f7bc74da02e5ebb
Author: Garik Badalyan <garikb@codeaurora.org>
Date:   Mon Jul 15 11:27:25 2013 -0700

        CSVT: Introduce Circuit-Switch Video Telephony.

        Introduce CSVT Service which provides necessary API
        for Circuit-Switch Video Telephony.

    Change-Id: I1d483212450720d64d05f4e2b02abf8da9f4b37e

commit 44619791fe6be551c7cd053c79cbde4f8aaff515
Author: Chaitanya Saggurthi <csaggurt@codeaurora.org>
Date:   Thu Jul 18 12:03:14 2013 +0530

    Telephony: Remove CDMA cellbroadcast API's

    Remove CDMA cellbroadcast API's, handle CDMA cellbroadcast
     management based on phone type in IccSmsInterfaceManager
     to sync with AOSP.

    Change-Id: I25b382d232799e964e8812de99c46e2dd372b20f

commit bcf3b86394e6311ad44a294e4a5a576c398f5be1
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Mon Jul 8 18:49:16 2013 +0530

    Telephony: Add DETECTED state and PIN/PUK retry count.

    1. Add App state DETECTED in the IccCardConstants.State enum.
       Modified logic for allowing PIN cancel based on number of
       cards configured/activated instead of number of cards present.

    2. Add method in ITelephonyMSim.aidl to retrieve PIN1RetryCount.
       Display Attempts remaining in PIN/PUK lockscreen UI.

    3. Clean up KeyguardUpdateMonitorCallback and MSimCarrierText by
       removing Initialize method from Callback.

    Change-Id: I89c9825b35257c1cca5946bf0cbffedb07d0015b
    CRs-Fixed: 501887, 504086, 508283, 510400, 513293

commit d6da6fa0a70a935859c965903161e6ff5da76a61
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Tue Mar 26 16:16:19 2013 +0530

    Telephony: Added ME Depersonalization support.

    Added support for all ME De-Personalizations as per specs
    3GPP2 C.S0068-0 and 3GPP TS 22.022.
    CRs-fixed: 467276

    Change-Id: Iba74e3e5eb4fe96361585f4933897c5c8f17db97

commit 45dcf94b38c031c6500fe076fd9dac6e7049a547
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Tue Jun 4 17:21:53 2013 +0530

    Telephony(MSIM): MultiSim support for PIN/PUK & Operator Name.

    -> Add CarrierText, SimPinView and SimPukView classes for MSIM.
    -> Add support to Display Multiple operator name.
    -> Add Support for Multiple PIN/PUK Lock screens.
    -> Overload few Keyguard methods to take sub info.

    Change-Id: I500129a5dc09adcb2cd8eb664d30ae2e8bad2642

commit c1f81610370f81a8da6f21d88328e6b791e07caf
Author: mengsun <msun@codeaurora.org>
Date:   Thu Jul 18 13:47:45 2013 +0800

    Telephony(MSIM): Set priority when send sms

    Add the priority support in 3gpp2 text message

    Change-Id: I27e92709a04a89c125424f99c2c61fbf6802c6b1

commit 7db863035ae90551014f7440102dbd9fc333163b
Author: Yashdev Singh <yashdevs@codeaurora.org>
Date:   Fri Jun 7 23:10:32 2013 +0530

    Telephony: Add RIL request and event for OMH support

    Change-Id: I8f68d6d9e1e188a2c2295a814376dccaaad5ec24

commit c8cb5b9a62a70c8f9a3d3c963f15e60ae78b601c
Author: Venkat Ram Prakash Kotni <vkotni@codeaurora.org>
Date:   Mon Apr 1 10:20:09 2013 +0530

    Telephony: Add TD-SCDMA support

    Add  network mode TD-SCDMA to the list
    of supported network modes.
    CRs-Fixed: 479310

    Change-Id: I132ac6a2108ef641ce4e71942a5c057a8df8e76c

commit 622b7b6aa5c2926ce7894b6b09e87a3daa3291e7
Author: Ravi Paluri <rpaluri@codeaurora.org>
Date:   Mon Jul 8 16:05:44 2013 +0530

    Ims: Fix for Phone App crash and NullPtrException in getCountryIso API

    When back to back VOLTE calls are made, sometimes
    next MO VOLTE call is failing due to a NullPointerException. The
    issue is because of unexpected value in getting the current
    country code. Added null check for detector.detectCountry(), if this
    function call fails, then CountryIso will be picked up based on the Locale
    CRs-Fixed: 478645, 490472

    Change-Id: I9f35fe959fc072bf59a6aabc6c17dc4162426721

commit 29b593eef54cb6ff69319f438b98fe9bc5d2998e
Author: Uma Maheswari Ramalingam <umam@codeaurora.org>
Date:   Tue Nov 15 16:18:07 2011 -0800

    Fix for data and roaming icons

    - Enable data connected flag based on the data state.

    - Do not display data icon in data connected state
    if radio type is unknown

    - Display data icon independent of voice service state
    i.e even if voice network is unavailable

    - Show cdma roaming indicators if either voice
    or data is roaming.

    - Cleanup roaming indicator default values.
    Set default CDMA Eri index to roaming off

    - Show service if either voice/data is in
    service if ro.config.combined_signal is true

    - Consider eri only when in service

    - Add in service check to isCdmaEri.
    roaming related information
    in registration state will not be valid
    during out of service.
    CRs-Fixed: 285986, 303275, 326204, 326634, 333008,
               339297

    Change-Id: I915421a6f5906d80ed5b8dd9c433115ad5df1f14

commit efc934f933d3bcda2fc6996bf56afdcd92885c56
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Thu Nov 1 18:15:48 2012 +0530

    Telephony(MSIM): Add StatusBar support for MultiSim.

    Add support for Signal Strength icon display for MultiSim.

    Add support for NO SIM icon support for multiple SIMs.

    Change-Id: I11fb6ed37e7ba40b8db7840feedd109557128758

commit d35797804276f7625097e13466b44b253c9d6cbe
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Mon Jul 8 17:02:50 2013 +0530

    Telephony: Change Default subscription property name.

    Change default subscription property name from
    persist.default.subscription to persist.radio.default.sub so
    that it can be set by radio group access processes.

    Change-Id: I0a75eca8c88c54e8f68ebd029abecb17249a546a

commit c201757290b5fd15368457b1d39c4c4ca2eb5943
Author: Jiju Kinattingal <jijuk@codeaurora.org>
Date:   Fri Oct 26 12:57:02 2012 +0530

    Telephony(DSDS): MMS Auto Download.

    Add MMS_TRANSACTION property which enables silent or prompt
    modes to download MMS on non-DDS sub.

    Change-Id: I52fe5c095e0d69c2e0d4a7fd5bfeb77bf3289380

commit c907d581b0c8be133f0c6487453f3aed1ce63531
Author: Sankar Gonella <sgvs@codeaurora.org>
Date:   Fri May 31 13:45:59 2013 +0530

    Ims: Fix the NullPointerException in getCountryIso() function

    Added Null check for detector.detectCountry(), if this function call
    fails, then CountryIso will be picked up based on the Locale.
    CRs-Fixed: 490472

    Change-Id: Ia94891629cf6170a821f76a718d4b965ae7ab802

commit f0c330feaf472b7da98491ddba2370e23ba22aba
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Tue Jun 18 17:58:02 2013 +0530

    Telephony(MSIM): Add support for MultiSim

    Make changes to add support for MultiSim.

      -Add TelephonyManager and TelePhonyRegistry for MultiSim
      -Add ITelephony and IPhoneSubinfo aidl files for MultiSim
      -Extend ShutdownThread to close all radio's for MultiSim
      -Add Constants and Utils used for MultiSim

    Change-Id: I6ee5d2a22e44fe7d0d68a41af0481ddbbbe21c3f

commit e74d0178b4e1f0c585ef50617d7b9d292c59d40a
Author: Srikanth Chintala <srikchin@codeaurora.org>
Date:   Sun Oct 21 02:20:06 2012 -0700

    Telephony: Initialize GsmCellLocation class members properly

    Default values for class members mLac, mCid, mPsc would be 0.
    Initialize these variables with -1 as 0 is considered as valid value.
    CRs-Fixed: 406479

    Change-Id: I08dc4031bb16293e80e5b7f51afcb8dc11747d3b

commit ed5b95c8b5173c5e6fdc57ea7d52de1cb7f2e609
Author: Suresh Koleti <skolet@codeaurora.org>
Date:   Fri Oct 19 01:05:46 2012 -0700

    Telephony: STK CC feature implementation

    Add strings and constants required for stk cc feature.

    Change-Id: Ief5786d3010467ec835096eaf1c02f67f2e5e0d1

commit 94c446b5c92f5f619b3acd851c9edb4904744a43
Author: Hariprasad Jayakumar <hjayak@codeaurora.org>
Date:   Mon Jun 17 15:45:14 2013 -0700

    Telephony: Add enable/disable APIs for Cdma CMAS

    Add enable/disable APIs for Cdma broadcast to ISms.aidl

    Change-Id: I8fb563d92691d0ce97395ed283165dc9179b586a

commit dfa6de7148943fcb8249d51f636642d8ff189ac7
Author: Rekha Kumar <rekhak@codeaurora.org>
Date:   Fri Mar 2 09:38:50 2012 -0800

    telephony: IMS changes for VoLTE and VT

    - Add IMS phone type constant
    - Add system property persist.radio.calls.on.ims.
      It is set to true if VoLTE/VT calls are supported,
      false otherwise.

    Change-Id: I9b2ea0e58bd75598c519ff710a93d7667a9c7993

commit 5c4cd1542e12b01a7ca0c9a3f1a40bbe65e86e32
Author: Chaitanya Saggurthi <csaggurt@codeaurora.org>
Date:   Thu May 30 21:32:55 2013 +0530

    Frameworks: Add TD-SCDMA support

    1)TD-SCDMA Signal Strength display changes.
    2)Add TD-SCDMA network type support in MobileDataStateTracker class
    to identify TD-SCDMA as UMTS variant and use the relevant
    kernel data stack tcp buffer sizes defined.

    + Telephony: Display 3g icons for tdscdma

    Updated: As per technology order & keeping in view of
    future changes, add TDSCDMA case along with UMTS type.

    Change-Id: I158821574484bfaf47d1660406e591e2afb3be5e
    CRs-Fixed: 403258

commit 28aded52f75fbacd4c3a73cb7584de1eef820546
Author: Alex Yakavenka <ayakav@codeaurora.org>
Date:   Wed Nov 28 14:38:38 2012 -0800

    Telephony: Add tethering definitions

    Change-Id: I435a602eb34b16a0c7a9e17a3102e249c98c6bb9

commit 2f1e20632b40da6a1b01dc410ffa0c32079e8a7c
Author: Rika Brooks <rbrooks@codeaurora.org>
Date:   Tue Aug 7 14:51:19 2012 -0700

    Telephony: SMS over IMS

    Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and
    RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED.  Add FORMAT_UNKNOWN to
    SmsConstants

    Change-Id: Iabaf4cce9f1da94f3f263d09cdd0bc29fbea741d

commit cf1e40271c4e3b8085c5dae776f7be5aeb74918c
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Mon Jan 21 13:23:51 2013 +0530

    Telephony: Few PIN/PUK fixes

    Following changes have been made as part of this:
    -> Changes done to display retry counter on wrong entry of
       PIN1,and message to indicate Code accepted/PIN1 blocked
       during PIN1 verification as per certain carrier requirements.
    ->The current APIs that are used to verify the PIN and PUK only convey
      whether the operation succeeded or failed. As a result on ANY failure
      clients ask the user to re-enter the PIN.
      Add 2 new APIs that report the actual error code in case of failure.
    ->Display the complete text including attempts remaining to
     unlock PIN on SimUnlockScreen if user entered incorrect PIN.
     On some devices the display text is ellipsized when trying to
     display on a single line.
    CRs-Fixed: 184479, 260481, 181402, 181380, 181401, 326286, 441001,
    479414, 479417

    Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08

commit 9a51a3ded44815316258d4c91ee143fe27efa2b5
Author: Sandeep Gutta <sangutta@codeaurora.org>
Date:   Thu Jan 3 19:12:17 2013 +0530

    Telephony: Managed Roaming feature re-design.

    Change-Id: I79c7ea2e647617e58526b5b550406214455a58aa

commit 7eaefaf413b1bb12e6ede54eeb0eae3e958bde4e
Author: Rakesh Pallerla <rakesh@codeaurora.org>
Date:   Wed Feb 6 11:44:23 2013 +0530

    Telephony: Add functionality to handle ICC IO error

    At present in Android all ICC Card states other than
    ICC PRESENT are treated as ICC ABSENT.Adding functionality
    to handle ICC IO error card state.
    CRs-Fixed: 184479

    Change-Id: Id6a8cf8c7bb2ed441bf8db15b84c4e426537fdb1

Change-Id: I53460849679280e4154a1fc398e7535988d5a6b1

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/RILConstants.java