Merge commit 'c58406cd7ed20632fcb2e2e794a27299d4321733' into HEAD

* commit 'c58406cd7ed20632fcb2e2e794a27299d4321733':
  Change all uses of PhoneApp.getInstance().phone to PhoneApp.getPhone().

Conflicts:
	src/com/android/phone/DTMFTwelveKeyDialer.java
	src/com/android/phone/InCallScreen.java
Merge (-sours) commit 'fb8842ff0e5c4614ecf271e185942e787301174a' into HEAD

* commit 'fb8842ff0e5c4614ecf271e185942e787301174a':
  Enforce CdmaOptions only be called for CDMA Phone.
Merge (-sours) commit '4255de8ccf5680c75a4e0ade7b63981f33ec355a' into HEAD

* commit '4255de8ccf5680c75a4e0ade7b63981f33ec355a':
  Cleanup CDMA and GSM differences in NotificationMgr
Merge commit '9e22d35e5f1d33613ce13745d83d59fcfc2e506e' into HEAD

* commit '9e22d35e5f1d33613ce13745d83d59fcfc2e506e':
  More minor "if (CDMA)" cleanup.

Conflicts:
	src/com/android/phone/TelephonyCapabilities.java
Merge commit '546a00dd3bb35abfcd44c696cd810073a084b43c' into HEAD

* commit '546a00dd3bb35abfcd44c696cd810073a084b43c':
  Change most uses of PhoneFactory to use PhoneApp.getPhone.

Conflicts:
	src/com/android/phone/CdmaCallOptions.java
	src/com/android/phone/CdmaOptions.java
	src/com/android/phone/EmergencyCallHandler.java
	src/com/android/phone/GsmUmtsOptions.java
Merge commit '24f2ad06f72bda5d06281ff082598aad60f74a66' into HEAD

* commit '24f2ad06f72bda5d06281ff082598aad60f74a66':
  CDMA/GSM cleanup in CallNotifier

Conflicts:
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/NotificationMgr.java
Merge commit '35e980f12cef04fc5c72b1ee87556503ceeeb21e' into HEAD

* commit '35e980f12cef04fc5c72b1ee87556503ceeeb21e':
  Clean up "if (CDMA)" checks for logging emergency numbers.

Conflicts:
	res/values/config.xml
	src/com/android/phone/CallNotifier.java
Merge (-sours) commit 'b632cabbaf60ca8fa8f23aafe13027303edfc6fc' into HEAD

* commit 'b632cabbaf60ca8fa8f23aafe13027303edfc6fc':
  CDMA/GSM cleanup in InCallScreen and phoneApp
Merge commit 'e45f782a4caf9945cfeee5f0cbb66008a749c61c' into HEAD

* commit 'e45f782a4caf9945cfeee5f0cbb66008a749c61c':
  add arrow graphics to Back and Next buttons bug: 2129653
Added support for Changing Phone network mode
Todo: Add permission control

Added permission control for the 2G/3G switch

Accept switching to NT_MODE_WCDMA_ONLY network mode

Change-Id: I33f612f523a6a9d41aef65c12148aaec98e5afcc
Phone: Double check mode before changing

A modem might report world phone mode when it really is only GSM or
CDMA capable, making the system switch to an invalid mode which
will later break the telephony code.
This simple check enforces the world phone overlay which is already
in place and will only consider it a correct value in that case.

Change-Id: Iedbc529497b2779f3a12ff56ca1b028cc9434227
Remove user tag
Fix merge with 546a00dd3bb35abfcd44c696cd810073a084b43c

    Change most uses of PhoneFactory to use PhoneApp.getPhone.

    The only entities using PhoneFactory are PhoneApp, NetworkQuerySerivce,
    BluetoothHeadsetSerive and EmergencyCallbackModeService.

    Change-Id: Idb961f2ccfabc1ac1ae90496bb23cfdd9d0febcc