Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD
"AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002"
* tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002': (68 commits)
Revert "IMS-VT: Change parameter type of data usage"
Play DTMF tones when sending DTMF tones during post dial wait.
IMS: Fix for add participant issue
IMS: Fix add participent and upgrade/downgrade button visibility
Revert "When adding a new call, use same phone account for call."
IMS LMR1 Compilation Fixes
Fixing issue where VoLTE conference calls have incorrect call time.
Rename VoLTE capability to HIGH_DEF_AUDIO.
Telecom API updates (4/6)
Fix Call hold issue
Compilation Fix.
Add timeout for emergency calls
PhoneAccount -> SubId for use in TelephonyManager#line1Number
Remove line to allow hiding SMS response from InCallUI in multiSIM.
Unplugging headset shouldn't stop Bluetooth.
Fix for call timer resetting when starting IMS conference call. 4/4
Disconnect held call when answering third call.
Add support to clean up calls that are alive
Set Quick Response pref as MULTI_PROCESS.
Fixing Telecom state dumping.
...
Conflicts:
src/com/android/server/telecom/Call.java
src/com/android/server/telecom/CallsManager.java
src/com/android/server/telecom/InCallController.java
Change-Id: I88da7ce3589c7a22dbbfed823e6063e3258f888a