Fix Operator && Numeric
Telephony: Move uicc classes into uicc package

Reduce constructor visibility to package where
possible

Dependent Changes:
    I3b718b9aea1f21c7906c8243b4ca0db6af495a08
    I80204a2f3dc57cac875abeab390bb9db7a636ff7
    Ib9c19e8b157dc7ec74eb14baca5bd3b5caf08c47

Change-Id: Ib4f43374c041cb5eaf2e3883e5ea28b2eb2c9a69

Conflicts:

	src/java/com/android/internal/telephony/cat/CatService.java
	src/java/com/android/internal/telephony/cat/ValueParser.java
	src/java/com/android/internal/telephony/cdma/CdmaConnection.java
	src/java/com/android/internal/telephony/uicc/IccFileHandler.java

Conflicts:

	Android.mk

Conflicts:
	Android.mk
	src/java/com/android/internal/telephony/HTCQualcommRIL.java
	src/java/com/android/internal/telephony/SamsungCDMAv6RIL.java
	src/java/com/android/internal/telephony/SamsungExynos3RIL.java
	src/java/com/android/internal/telephony/SamsungQualcommRIL.java
	src/java/com/android/internal/telephony/SemcQualcomm7x30RIL.java
Telephony: Introduce DataProfile base class

DataProfile is a base class from which we derive ApnSetting
for GSM and DataProfileCdma for CDMA. This can be extended
for other classes of DataProfiles.

Change-Id: I61bddbe6e57baf44325264a7f255cf19c1119f81

Conflicts:

	src/java/com/android/internal/telephony/ApnContext.java
	src/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
	src/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
Enable OMH support in Android Telephony

Support the Open Mobile Handset initative in android telephony. As per
the OMH specification in 3GPP2, Data profiles defined for specific
services like LBS, TETHERED and UNSPECIFIED are defined in the
RUIM/CSIM cards. These profiles are read from the android telephony
and used for creating the data calls when the right radio technology
(CDMA/DO) is used and when the feature is enabled.

* Supports multiple profiles for a particular OMH service type

* Supports multiple OMH profiles with same priority

* In case of OMH, for all profiles supporting SUPL, arbitration
should choose the lowest priority profile when making data calls

* This feature supports the co-existance of other radio technologies in
an OMH enabled device. Even with the OMH feature enabled, the device
can operate with default profiles when OMH profiles are not (yet)
present.

* Use PROFILE_TYPE_CDMA if no suitable PROFILE_TYPE_OMH available

* Fix phone crash:
Default code triggers setupDataCall even for cdma detachet event.
In a handoff scenario cdma detach event is sent before the objects
are initialized (profiles being read) and CdmaDCT attempts a call
with null DataProfile object.

* Add null checks in CdmaDataConnection

Change-Id: I7f58c9a4ba434b1fde01fa4a0abfaf0ce4cacbea

Conflicts:
	src/java/com/android/internal/telephony/CommandsInterface.java
	src/java/com/android/internal/telephony/RIL.java
	src/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
	src/java/com/android/internal/telephony/sip/SipCommandInterface.java
	src/java/com/android/internal/telephony/test/SimulatedCommands.java
Sorry,lost this
Fix build
Telephony: Use DATA_REGISTRATION_STATE for data

Use reg state from DATA_REGISTRATION_STATE when in LTE/EHRPD
and also for CDMA. Without this fix, the radiotech in voice
reg. state would get processed for CDMA and data calls get
attempted prematurely.

Change-Id: I1509a6ffe33fc0fc87661aa5d955a61597daf10c
CRs-Fixed: 323323

Conflicts:

	telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
Telephony: CDMA - Handle call collision scenarios

There can be 2 types of call collisions
    - Modem/RIL dropping an existing call and replace it with
      another one with the same call id (index)
    - Modem/RIL, after ending the previous call, reports the new
      call with a different call id
Both these above cases have been handled to avert undesirable
behavior at telephony layer.

Change-Id: Ib9fb5e2a46c80783e332c78a034313dadac1e4ce
CRs-Fixed: 453390
Telephony: Fix NPE in CdmaConnection

When card is removed and call gets terminated
getUiccCardApplication will return null

Change-Id: Ic861e5b5ee8515de431c33152fd11d2c45a2a353

Conflicts:
	src/java/com/android/internal/telephony/cdma/CdmaConnection.java
Telephony: Fix null pointer bug for dun call

* After a DUN call is made with data disabled (on cdma), the DUN call
 teardown causes a null pointer exception since there will be no data
 call or APN that is active.

Change-Id: I256afaeee713be439890b8737bae3d6f41639b21
CRs-Fixed: 435456

Conflicts:
	src/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java