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

Commit 461aab6b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11444858 from 11318e56 to 24Q2-release 

Change-Id: I59a2057460f9d4c9c46d26376f1c8a5f6bbd219e
parents 1b1b50db 11318e56

flags/telecom_api_flags.aconfig

+7 −1
Original line number Diff line number Diff line
@@ -22,10 +22,16 @@ flag{ 
  bug: "292597423"

}





flag{

  name: "set_mute_state"

  namespace: "telecom"

  description: "transactional calls need the ability to mute the call audio input"

  bug: "310669304"

}



flag{

  name: "business_call_composer"

  namespace: "telecom"

  description: "Enables enriched calling features (e.g. Business name will show for a call)"

  bug: "311688497"

}

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

+7 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.util.Pair; 
import com.android.internal.annotations.VisibleForTesting;

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

import com.android.server.telecom.flags.FeatureFlags;

import com.android.server.telecom.flags.Flags;



import java.util.Arrays;

import java.util.Locale;
@@ -418,7 +419,12 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        paramBuilder.setCallType(callLogType);

        paramBuilder.setIsRead(call.isSelfManaged());

        paramBuilder.setMissedReason(call.getMissedReason());



        if (Flags.businessCallComposer() && call.getExtras() != null) {

            paramBuilder.setIsBusinessCall(call.getExtras().getBoolean(

                    android.telecom.Call.EXTRA_IS_BUSINESS_CALL, false));

            paramBuilder.setBusinessName(call.getExtras().getString(

                    android.telecom.Call.EXTRA_ASSERTED_DISPLAY_NAME, ""));

        }

        sendAddCallBroadcast(callLogType, call.getAgeMillis());



        boolean okayToLog =

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

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.BlockedNumberContract;

import android.provider.BlockedNumberContract.SystemContract;

import android.provider.BlockedNumberContract.BlockedNumbers;

import android.provider.CallLog.Calls;

import android.provider.Settings;

import android.sysprop.TelephonyProperties;
@@ -556,7 +556,7 @@ public class CallsManager extends Call.ListenerBase 
        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(action)

                    || SystemContract.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED.equals(action)) {

                    || BlockedNumbers.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED.equals(action)) {

                updateEmergencyCallNotificationAsync(context);

            }

        }
@@ -751,7 +751,7 @@ public class CallsManager extends Call.ListenerBase 
        IntentFilter intentFilter = new IntentFilter(

                CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        intentFilter.addAction(SystemContract.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED);

        intentFilter.addAction(BlockedNumbers.ACTION_BLOCK_SUPPRESSION_STATE_CHANGED);

        context.registerReceiver(mReceiver, intentFilter, Context.RECEIVER_EXPORTED);

        mGraphHandlerThreads = new LinkedList<>();
@@ -2926,7 +2926,7 @@ public class CallsManager extends Call.ListenerBase 


        if (call.isEmergencyCall()) {

            Executors.defaultThreadFactory().newThread(() ->

                    BlockedNumberContract.SystemContract.notifyEmergencyContact(mContext))

                    BlockedNumberContract.BlockedNumbers.notifyEmergencyContact(mContext))

                    .start();

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class ParcelableCallUtils { 
        RESTRICTED_CALL_SCREENING_EXTRA_KEYS = new ArrayList<>();

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS.add(android.telecom.Connection.EXTRA_SIP_INVITE);

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS.add(ImsCallProfile.EXTRA_IS_BUSINESS_CALL);

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS.add(ImsCallProfile.EXTRA_ASSERTED_DISPLAY_NAME);

    }



    public static class Converter {

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

+4 −1
Original line number Diff line number Diff line
@@ -787,6 +787,9 @@ public class TelecomServiceImpl { 
                        Bundle extras = account.getExtras();

                        if (extras != null

                                && extras.getBoolean(PhoneAccount.EXTRA_SKIP_CALL_FILTERING)) {

                            // System apps should be granted the MODIFY_PHONE_STATE permission.

                            enforceModifyPermission(

                                    "registerPhoneAccount requires MODIFY_PHONE_STATE permission.");

                            enforceRegisterSkipCallFiltering();

                        }

                        final int callingUid = Binder.getCallingUid();
@@ -1951,7 +1954,7 @@ public class TelecomServiceImpl { 
                synchronized (mLock) {

                    long token = Binder.clearCallingIdentity();

                    try {

                        BlockedNumberContract.SystemContract.endBlockSuppression(mContext);

                        BlockedNumberContract.BlockedNumbers.endBlockSuppression(mContext);

                    } finally {

                        Binder.restoreCallingIdentity(token);

                    }