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

Commit d363b819 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5681502 from 621cc236 to qt-qpr1-release 

Change-Id: I87c2f3fb71a5c61c408a62b5ed1a41bc2d48acb3
parents d69aa815 621cc236

res/values-da/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ 
    <string name="change_default_dialer_dialog_affirmative" msgid="8606546663509166276">"Indstil standard"</string>

    <string name="change_default_dialer_dialog_negative" msgid="9078144617060173845">"Annuller"</string>

    <string name="change_default_dialer_warning_message" msgid="1417671460801684999">"<xliff:g id="NEW_APP">%s</xliff:g> kan foretage og administrere alle aspekter af opkald. Du bør kun indstille en app til din standardapp til opkald, hvis du har tillid til den."</string>

    <string name="change_default_call_screening_dialog_title" msgid="8714534302859934164">"Vil du gøre <xliff:g id="NEW_APP">%s</xliff:g> til din standardapp til opkaldsvalg?"</string>

    <string name="change_default_call_screening_warning_message_for_disable_old_app" msgid="5128397581530600941">"<xliff:g id="OLD_APP">%s</xliff:g> kan ikke længere vælge opkald."</string>

    <string name="change_default_call_screening_warning_message" msgid="3881131132588596837">"<xliff:g id="NEW_APP">%s</xliff:g> kan se oplysninger om opringere, når de ikke er i dine kontakter, og kan blokere disse opkald. Du bør kun angive en app som din standardapp til opkaldsvalg, hvis du har tillid til den."</string>

    <string name="change_default_call_screening_dialog_title" msgid="8714534302859934164">"Vil du gøre <xliff:g id="NEW_APP">%s</xliff:g> til din standardapp til screening?"</string>

    <string name="change_default_call_screening_warning_message_for_disable_old_app" msgid="5128397581530600941">"<xliff:g id="OLD_APP">%s</xliff:g> kan ikke længere screene opkald."</string>

    <string name="change_default_call_screening_warning_message" msgid="3881131132588596837">"<xliff:g id="NEW_APP">%s</xliff:g> kan se oplysninger om opringere, når de ikke er i dine kontakter, og kan blokere disse opkald. Du bør kun angive en app som din standardapp til screening, hvis du har tillid til den."</string>

    <string name="change_default_call_screening_dialog_affirmative" msgid="5503888845998386856">"Angiv som standard"</string>

    <string name="change_default_call_screening_dialog_negative" msgid="3420459312464019224">"Annuller"</string>

    <string name="blocked_numbers" msgid="2751843139572970579">"Blokerede telefonnumre"</string>

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

+25 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.telecom;



import static android.telephony.CarrierConfigManager.KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL;



import android.annotation.Nullable;

import android.content.Context;

import android.content.Intent;
@@ -35,10 +37,12 @@ import android.telecom.PhoneAccountHandle; 
import android.telecom.VideoProfile;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.SubscriptionManager;



// TODO: Needed for move to system service: import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CallerInfo;

import com.android.internal.telephony.SubscriptionController;

import com.android.server.telecom.callfiltering.CallFilteringResult;



import java.util.Arrays;
@@ -129,6 +133,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
    private static final String TAG = CallLogManager.class.getSimpleName();



    private final Context mContext;

    private final CarrierConfigManager mCarrierConfigManager;

    private final PhoneAccountRegistrar mPhoneAccountRegistrar;

    private final MissedCallNotifier mMissedCallNotifier;

    private static final String ACTION_CALLS_TABLE_ADD_ENTRY =
@@ -144,6 +149,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
    public CallLogManager(Context context, PhoneAccountRegistrar phoneAccountRegistrar,

            MissedCallNotifier missedCallNotifier) {

        mContext = context;

        mCarrierConfigManager = (CarrierConfigManager) mContext

                .getSystemService(Context.CARRIER_CONFIG_SERVICE);

        mPhoneAccountRegistrar = phoneAccountRegistrar;

        mMissedCallNotifier = missedCallNotifier;

        mLock = new Object();
@@ -193,7 +200,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
     * should be logged in its PhoneAccount

     */

    @VisibleForTesting

    public boolean shouldLogDisconnectedCall(Call call, int oldState, boolean isCallCanceled) {

    public boolean shouldLogDisconnectedCall(Call call, int oldState, boolean isCallCancelled) {

        // "Choose account" phase when disconnected

        if (oldState == CallState.SELECT_PHONE_ACCOUNT) {

            return false;
@@ -211,7 +218,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        }



        DisconnectCause cause = call.getDisconnectCause();

        if (isCallCanceled) {

        if (isCallCancelled) {

            // No log when disconnecting to simulate a single party conference.

            if (cause != null

                    && DisconnectCause.REASON_EMULATING_SINGLE_CALL.equals(cause.getReason())) {
@@ -228,13 +235,27 @@ public final class CallLogManager extends CallsManagerListenerBase { 
            return false;

        }



        // Call merged into conferences.

        // Call merged into conferences and marked with IMS_MERGED_SUCCESSFULLY.

        if (cause != null && android.telephony.DisconnectCause.toString(

                android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY)

                .equals(cause.getReason())) {

            int subscriptionId = mPhoneAccountRegistrar

                    .getSubscriptionIdForPhoneAccount(call.getTargetPhoneAccount());

            // By default, the conference should return a list of participants.

            if (subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                return false;

            }



            PersistableBundle b = mCarrierConfigManager.getConfigForSubId(subscriptionId);

            if (b == null) {

                return false;

            }



            if (b.getBoolean(KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL, true)) {

                return false;

            }

        }



        boolean shouldCallSelfManagedLogged = call.isLoggedSelfManaged()

                && (call.getHandoverState() == HandoverState.HANDOVER_NONE

                || call.getHandoverState() == HandoverState.HANDOVER_COMPLETE);