Telephony: GSM: remove 'Carrier Settings' regardless of csp_enabled

Carrier Settings should be removed when config_carrier_settings_enable
is false. csp_enabled has nothing to do with it.

Fixes "Carrier Settings" appearing and crashing when the user clicks
on it.

Change-Id: I31c508f2353eb15a096aa279e71c4be4ce89abb8
Revert "XDivert changes for MSIM"

This reverts commit fa66d7833488cff0c0c6a69c92e87e2fc78af894.

XDivert links to some package we don't have, leading to a crash.

Change-Id: I740594dfbb1700fa45bf92dcdad4d23a03229b72

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
Fix permission issue in SelectSubscription Activity.

Add permission com.qti.permission.SELECT_SUBSCRIPTION
in SelectSubscription class for safe-guard. This will
ensure that caller should have above permission to call
the SelectSubscription class.

Change-Id: I1da89520f5fbf258ef69f01bf6f48d14c7f1aae5
CRs-Fixed: 705563
Display Supplementary service failure

Whenever there is a supplementary service failure recieved from
RIL user will be notified with the dialog.

Change-Id: I7ac6283744dce1d3d06a2362a4b2fca9ba903f49
CRs-Fixed: 610064
Handle Dialing State during Emergency Call Dial from APM.

When Emergency call retry timer expires and the call
is still in dialing state, Emergency CallHelper assumes
the call is connected and cleanup happens.
Do not clean up until we are out of dialing state and
wait for the call connection to progress further before
cleaning up and end the Emergency call attempt.

Change-Id: I8bbe7a45801ffe9858cfc3931c056e383e6112e5
CRs-Fixed: 600481
IMS: Allow dial Conference call without URI List

Add code not to disconnect if number is empty,
rather place call with empty URI.

Change-Id: Ib3c42087336852b4a1d5645516f9901c48b999dc
CRs-Fixed: 681238
Listen to events with proper subId

Callnotifier initially registers with default sub ids to phonestate
listener. Once subscriptions are activated and valid sub Ids are assigned,
deregister and register again with phonestate listener, so that CallNotifier
get events properly.

Change-Id: I0accd4becc7b3f0f22936499d98e0a587ba44e5f
CRs-Fixed: 745989

Conflicts:
	src/com/android/phone/CallNotifier.java
Fix DDS switch issue.

Set DDS back to previous sub when doing primary sub switch if user
do not want to switch DDS.

Change-Id: Ic8368862977fcad2e9082e5f9608bdf3daef6353
Propagate the call substate changed message to the UI

Change-Id: Icab1e8100fd4ac89fdc3c12e9eaeae15376f774c
CRs-Fixed: 749824
Disable manual network selection in Global modes.

For multimode targets disable manual network selection
and force automatic mode network selection
in Global and Global+LTE modes.
Global Pre-FIT Test Cases: 5.6.4, 5.6.5, 5.6.8

Change-Id: I3d09d4beb7c2cf2e04d3c67beefff292ad28b4c2
CRs-Fixed: 735057
IMS-VT: Do not allow changing the TTY mode during a Video call

When the device is already in a video call, the user SHOULD NOT
be allowed to change the TTY mode. If the user tries to change,
then an UI alert message will be displayed explaining it cannot
be changed during video calls.

Change-Id: Ibb089c125d509ae8d2ebd3d351850dc20ec1b074
CRs-Fixed: 734258
Provide generic string support for SIM contact operations.

Replace hint as text with string value in contact_screen.xml
to provide multilanguage support, while performing SIM contact
operations.

Change-Id: Ic63a13929af22a8b80691609480fb2ae2cbe0d61
CRs-Fixed: 715346
Revert "Telephony: fix getIccOperatorNumeric"

This reverts commit a65f33c1746c0992e71fa88b5dbb0e9226078ceb.

Change-Id: I5d096e82b5883463aba9bb2b783d790df05db90d
TeleService: Change the netType get interface

Need to fetch the family by radio technology gotten form service
state, not from telephony manager.

CRs-Fixed: 743497

Change-Id: Ife38e29f8e5bc99049c9a9ea6540fd50841ebc71
Enhance log message in handleVideoCapabilitesChanged

- Add the video capability value to the log message

Change-Id: I57d7a1603aaddd239316fe401c0bbb7dc791ed47
CRs-Fixed: 753845
Telephony: Add new api isMmsDataConnectivityPossible.

- New api for applications preemptive action.

Change-Id: Ie8252d63f1423d0db91fe3826796d7b9d5e94cde
Add checks for invalid subId while managing SimContacts.

Add checks for invalid subid while exporting or importing
Sim Contacts.

Change-Id: Idf793f80b7cdbbffa40cd5a2aef16f82682f7649
CRs-Fixed: 754770
Add Managed Roaming feature support.

Add support to listen for Managed Roaming intent and
based on the received intent information display a pop-up
notification to user to provide an option to perform manual
network scan operation.

Do not show roaming dialog pop-up when network scan is in
progress.

Change-Id: I67118e1e351aab5ce7eabc71bd7ced831bdbb944
(cherry picked from commit 5fd002edcbad399b5072642c78207e11a3586667)
(cherry picked from commit 3a5eee47f062e55ab5980e158441d358957a4967)
(cherry picked from commit 4e553b86b74be09dc48df5e3c2fccd17349760f7)
IMS Call Extras Feature

Adding the setExtras method to propagate
MT call extras to the Telecom and UI
layers.

Change-Id: I823902de0c3c154f31d47649386f842a69335028
CRs-Fixed: 724860
Fix for ArrayIndexOutOfBoundException

The preferred_network_mode_choices array length
do not match the preferred_network_mode_values
length and hence crash is seen.

Change-Id: Ife8c49064f58cdce28b8f58be01b6bf21091029f
CRs-Fixed: 758618