Phone(MSIM): Initialize CDMA OTASP variables properly

Incase of GSM SUB as default sub with other sub as CDMA, The OTASP
related variables are not initialized. This causes crash whenever
a call is made. This is fixed with this change.

Change-Id: Ic36794de51089105844658c0c380d11c53230a82
CRs-Fixed: 524921
merge fixes
Phone(DSDA): Fix ringtone playing issue

On DSDA do not play ring tone for new incoming call
if a voce call already active on another sub.

Change-Id: Ibe4c8f8f8288d2f3db8776075b19b7961055f7b0
Fix for the Null pointer exception failure

Calling party number can be excluded by the network. Hence below call
may cause a NullPointerException.
    - ((cn.getAddress()).equals(fgcn.getAddress())

This change fixes the issue.

Change-Id: I612fea0f517ef6f80e2a91a321254557c3ff371b
CRs-Fixed: 529557
Phone(MSIM): Managed Roaming support for multisim

Add code to parse the subscription information from
the received managed roaming intent, based on the received
subscription id display the notification to user and
also perform the manual network scan request on the
received subscription.

Change-Id: Iec5958a25b74c5006ddf29478aae860bc95aaf22
CRs-Fixed: 529256
MSIM: Move the setActiveSubscription call to the other placeCall function

This is to ensure setActiveSubscription will be called when either
of the placeCall functions is involked.

Change-Id: I610762cdfec6e38dc80b9318a33c33f12b43856f
CRs-Fixed: 529815
MSIM : Add null check for MSISDN for X-Divert

ICCID Card MSISDN not available, launching of X-Divert
causes a phone crash. This is due to the variable mMsisdn
being null during ICC Card initialization. As part of the
fix, before using the result of getLine1Number in
PhoneNumberUtils.formatNumber, a null check is done.

Change-Id: Ie502435006bf9d44ca8736682fea2e8da35b4ecc
CRs-Fixed: 528438
IMS: ECBM exit scenario.

While in ECBM mode, if MO SMS is initiated
then prompt will be displayed to the user
to exit ECBM. On Yes, phone should
come out of ECBM.
Pick the right phone for this scenario.

CRs-Fixed: 519508
Change-Id: Ie15fa8f35f28d44187af2352e23bfcb9879fd8e9
Phone(DSDA): Refresh InCall UI when sub changes

Update InCallScreen states when the current active
subscription changes.

Change-Id: I52d3044f2b09e22e7f175f8b35437fd67c40383d
IMS: Aidl changes for Hangup feature

Aidl changes for call hangup feature.

Change-Id: I3c42f222276a8163e29d843f651803af4e4b9488
CRs-Fixed: 518160
IMS-VT: User consent fix

Change user consent table to have user consent for upgrade cases,
and no user consent for downgrade cases.

Change-Id: I61d09c5cc983c397d78cbce803b6427027358f7c
CRs-Fixed: 517439
IMS-VT: Recording buffer changes

-Remove START_READY event handling
-Stop recording while recofiguring camera

Change-Id: I14d18d1a4d3a10704390a3352f63fad9d1c96333
CRs-Fixed: 531842
Phone(MSIM): Add MSIM Voicemail and Call forwarding icons.

Add support to display Voicemail and Call forwarding icons for MSIM.
MSIM Voice mail and Call forwarding icons are added in PhoneApp so
that these icons are not publicly exposed.

Change-Id: Ie9dee534b8db78cfa9af57b75638db10e62f1fa8
CRs-Fixed: 373471,441194
Phone(MSIM): LCH and SCH tones related changes.

- Do not start playing SCH/LCH tones when a subscription
  is in RINGING state.
- Restart playing of LCH/SCH tones when subscription switch
  happens.

Change-Id: Ic85610b37b6aaaa0f5886633f11eca59d9672dde
CRs-Fixed: 529780
Phone(MSIM): register CDMA call waiting ind only for CDMA sub

In current implementation, subscription id is extracted
from userObj in call waiting ind, but subscription id is not passed
when registering for call waiting ind hence it is null resulting in
phone app crash.
As part of this fix, CDMA subscription id is passed when registering
for CMDA call waiting ind.

Change-Id: I1b865f117f351f8dd766ba61701ff9a26292b2b7
CRs-Fixed: 531152
Phone(MSIM): Local call waiting tone related fix.

While two voice calls in RINGING state, if user accepts
one voice call out of that, start playing LCW tone to
inform user about the other RINGING call.

Change-Id: I042b8a72971213e9197d3d8b5376805272c788e8
CRs-Fixed: 533272
Phone: Phone app crash after entering correct N/W unlock PIN.

Resources are not present in res/values/ folder which is
resulting in resource not found exception.Add strings
in strings.xml to fix the issue.

Change-Id: Ic8b7318ca04bf293ee370d277ec4ee55a61ba249
CRs-Fixed: 521631
Phone(MSIM): Fix for missing incoming call controls

The last incoming call action time may cause incoming call
controls missing because it is shared by both subs.

This fix records the last incoming call action times for each sub.

Change-Id: I45ce6b8f4ce81164e336d2843effded2a1c07055
CRs-Fixed: 534430
Phone(MSIM): Display Mobile Networks SUBS settings properly

"Network operators" menu is by default disabled in SUB2 network
settings due to improper retrieval of phone object. The change is
done to use the correct phone object to check for manual selection
data and enable the above said menu item.

Change-Id: I265d4ba8dd29efb7546c2462c028943e8418a31f
CRs-Fixed: 535375

Conflicts:
	src/com/android/phone/GsmUmtsOptions.java