Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca0c678a authored by David Ng's avatar David Ng
Browse files

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
parents 8ad27bdd a20d5b05

res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="telecommAppLabel" product="default" msgid="9166784827254469057">"Foonoproepbestuur"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Foon"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Bel"</string>

    <string name="unknown" msgid="6878797917991465859">"Onbekend"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepe"</string>

res/values-mn-rMN/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="telecommAppLabel" product="default" msgid="9166784827254469057">"Гар утасны Дуудлагын Удирдлага"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Гар утас"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Утас"</string>

    <string name="unknown" msgid="6878797917991465859">"Тодорхойгүй"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Аваагүй дуудлага"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Аваагүй дуудлагууд"</string>

res/values-nl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    <string name="enable_account_preference_title" msgid="2021848090086481720">"Oproepaccounts"</string>

    <string name="outgoing_call_not_allowed_user_restriction" msgid="8504993498756056279">"Alleen noodoproepen zijn toegestaan door de apparaateigenaar."</string>

    <string name="outgoing_call_not_allowed_no_permission" msgid="1996571596464271228">"Deze app kan geen uitgaande oproepen starten zonder telefoonrechten."</string>

    <string name="outgoing_call_error_no_phone_number_supplied" msgid="1940125199802007505">"Als u wilt bellen, moet u een geldig nummer invoeren."</string>

    <string name="outgoing_call_error_no_phone_number_supplied" msgid="1940125199802007505">"Als je wilt bellen, moet je een geldig nummer invoeren."</string>

    <string name="duplicate_video_call_not_allowed" msgid="3749211605014548386">"Oproep kan momenteel niet worden toegevoegd."</string>

    <string name="video_call_not_allowed_if_tty_enabled" msgid="7593649283571253283">"Schakel de TTY-modus uit om videogesprekken te voeren."</string>

    <string name="no_vm_number" msgid="4164780423805688336">"Voicemailnummer ontbreekt"</string>

res/values-pt-rPT/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="telecommAppLabel" product="default" msgid="9166784827254469057">"Gestão de chamadas do telemóvel"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Telemóvel"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Telefone"</string>

    <string name="unknown" msgid="6878797917991465859">"Desconhecido"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada não atendida"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas não atendidas"</string>

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

+16 −11
Original line number Diff line number Diff line
@@ -938,8 +938,12 @@ public final class BluetoothPhoneServiceImpl { 
            }



            int numActiveCalls = activeCall == null ? 0 : 1;

            int numHeldCalls = callsManager.getNumHeldCalls();

            boolean callsSwitched = (numHeldCalls == 2);

            int numHeldCalls = mCallsManager.getNumHeldCalls();

            // Intermediate state for GSM calls which are in the process of being swapped.

            // TODO: Should we be hardcoding this value to 2 or should we check if all top level calls

            //       are held?

            boolean callsPendingSwitch = (numHeldCalls == 2);



            // For conference calls which support swapping the active call within the conference

            // (namely CDMA calls) we need to expose that as a held call in order for the BT device

            // to show "swap" and "merge" functionality.
@@ -947,8 +951,8 @@ public final class BluetoothPhoneServiceImpl { 
            if (activeCall != null && activeCall.isConference() &&

                !activeCall.can(Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN)) {

                if (activeCall.can(Connection.CAPABILITY_SWAP_CONFERENCE)) {

                    // Indicate that BT device should show SWAP command by indicating that there

                    // is a call on hold, but only if the conference wasn't previously merged.

                    // Indicate that BT device should show SWAP command by indicating that there is a

                    // call on hold, but only if the conference wasn't previously merged.

                    numHeldCalls = activeCall.wasConferencePreviouslyMerged() ? 0 : 1;

                } else if (activeCall.can(Connection.CAPABILITY_MERGE_CONFERENCE)) {

                    numHeldCalls = 1;  // Merge is available, so expose via numHeldCalls.
@@ -966,13 +970,14 @@ public final class BluetoothPhoneServiceImpl { 
            }



            if (mBluetoothHeadset != null &&

                    (force ||

                            (!callsPendingSwitch &&

                                    (numActiveCalls != mNumActiveCalls ||

                                     numHeldCalls != mNumHeldCalls ||

                                     bluetoothCallState != mBluetoothCallState ||

                                     !TextUtils.equals(ringingAddress, mRingingAddress) ||

                                     ringingAddressType != mRingingAddressType ||

                    (heldCall != mOldHeldCall && !ignoreHeldCallChange) ||

                    force) && !callsSwitched) {

                                     (heldCall != mOldHeldCall && !ignoreHeldCallChange))))) {



                // If the call is transitioning into the alerting state, send DIALING first.

                // Some devices expect to see a DIALING state prior to seeing an ALERTING state