Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26': (27 commits)
Add "public" missed call notification.
Make InCall wakelock non-reference counted
Make InCall wakelock non-reference counted
Read headset state from audio manager instead of calculating ourselves.
Format missed number in missed call notification.
Format missed number in missed call notification.
Change requirements for emergency call timeout
Import translations. DO NOT MERGE
Change requirements for emergency call timeout
Abandon audioFocus only when all the calls are disconnected.
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
Ensure BT headset state updation before connect.
Don't request audio focus on call rejection.
Reject incoming calls when dialing a outgoing call
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Disallow resetting of emergency flag in telecom.
Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
Pass call subject from ACTION_CALL intent to Connections.
Import translations. DO NOT MERGE
...
Conflicts:
src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
src/com/android/server/telecom/CallAudioManager.java
src/com/android/server/telecom/CallIntentProcessor.java
src/com/android/server/telecom/CallsManager.java
src/com/android/server/telecom/components/UserCallIntentProcessor.java
Change-Id: I886b859523cc6c02591e71ac68d37409b733987f