diff options
| author | Suchand Ghosh <suchan@codeaurora.org> | 2014-09-24 10:44:23 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2014-12-27 06:19:39 -0800 |
| commit | 185db00c1aabe45d5f4e52db83b974fb5bc60888 (patch) | |
| tree | 89239dc92d829970a5b477bdfd96a07710f703a2 /Android.mk | |
| parent | f38437e108fd1864e8e4a7e3e4fc54128920fef4 (diff) | |
| download | android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.tar.gz android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.tar.bz2 android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.zip | |
IMS: Clean up Conference URI system property.
Remove system property "persist.dbg.ims_volte_enable".
Add platform configuration flag and user's enhanced 4G
LTE setting to decide IMS capability.
Change-Id: I1ee4dfb8e73ae7bf72a3daafef6957736a560606
CRs-Fixed: 727689
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 1f9c4deb4..c7323411f 100644 --- a/Android.mk +++ b/Android.mk @@ -27,7 +27,9 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.contacts.common \ --extra-packages com.android.phone.common -LOCAL_JAVA_LIBRARIES := telephony-common +LOCAL_JAVA_LIBRARIES := telephony-common \ + ims-common + LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.services.telephony.common \ com.android.vcard \ |