fb40dd4d00bd3361b2535bc866e6c21eadc52558 - platform/frameworks/base

commit	fb40dd4d00bd3361b2535bc866e6c21eadc52558	[log] [tgz]
author	Wink Saville <wink@google.com>	Thu Jun 12 17:02:31 2014 -0700
committer	Wink Saville <wink@google.com>	Fri Jun 13 13:30:57 2014 +0000
tree	01786f3e2bc9c803801f43fb8bc942e55a06e859
parent	6dfa6e2a9be08a3a0f152a7b772efc8ce2469bce [diff]

Merge kwd to master

Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04

Android.mk[diff]
CleanSpec.mk[diff]
core/java/android/provider/Settings.java[diff]
core/res/res/drawable-hdpi/sim_dark_blue.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_dark_green.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_dark_orange.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_dark_purple.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_light_blue.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_light_green.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_light_orange.9.png[Added - diff]
core/res/res/drawable-hdpi/sim_light_purple.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_dark_blue.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_dark_green.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_dark_orange.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_dark_purple.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_light_blue.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_light_green.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_light_orange.9.png[Added - diff]
core/res/res/drawable-mdpi/sim_light_purple.9.png[Added - diff]
core/res/res/layout/subscription_item_layout.xml[Added - diff]
core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
services/core/java/com/android/server/NetworkManagementService.java[diff]
services/core/java/com/android/server/TelephonyRegistry.java[diff]
telephony/java/android/telephony/PhoneNumberUtils.java[diff]
telephony/java/android/telephony/PhoneStateListener.java[diff]
telephony/java/android/telephony/SubInfoRecord.aidl[Added - diff]
telephony/java/android/telephony/SubInfoRecord.java[Added - diff]
telephony/java/android/telephony/SubscriptionManager.java[Added - diff]
telephony/java/android/telephony/TelephonyManager.java[diff]
telephony/java/android/telephony/VoLteServiceState.aidl[Added - diff]
telephony/java/android/telephony/VoLteServiceState.java[Added - diff]
telephony/java/com/android/internal/telephony/CallerInfo.java[diff]
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java[diff]
telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl[diff]
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl[diff]
telephony/java/com/android/internal/telephony/ISms.aidl[diff]
telephony/java/com/android/internal/telephony/ISub.aidl[Added - diff]
telephony/java/com/android/internal/telephony/ITelephony.aidl[diff]
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl[diff]
telephony/java/com/android/internal/telephony/PhoneConstants.java[diff]
telephony/java/com/android/internal/telephony/RILConstants.java[diff]
telephony/java/com/android/internal/telephony/TelephonyIntents.java[diff]
telephony/java/com/android/internal/telephony/TelephonyProperties.java[diff]

44 files changed

tree: 01786f3e2bc9c803801f43fb8bc942e55a06e859