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

Commit 0f86cb9b authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Adjust Telecom code for newly exposed constants"

parents 5ed51aa8 ddcd0d73

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

+4 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.telecom.DisconnectCause; 
import android.telecom.Logging.EventManager;

import android.telecom.ParcelableCallAnalytics;

import android.telecom.TelecomAnalytics;

import android.telecom.TelecomManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.util.Base64;
@@ -36,7 +37,6 @@ import com.android.server.telecom.nano.TelecomLogClass; 
import java.io.PrintWriter;

import java.time.Instant;

import java.time.ZoneOffset;

import java.time.ZonedDateTime;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;
@@ -45,8 +45,6 @@ import java.util.HashMap; 
import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.Optional;

import java.util.PriorityQueue;

import java.util.concurrent.LinkedBlockingDeque;

import java.util.stream.Collectors;
@@ -576,11 +574,11 @@ public class Analytics { 


    // Constants for call source

    public static final int CALL_SOURCE_UNSPECIFIED =

            ParcelableCallAnalytics.CALL_SOURCE_UNSPECIFIED;

            TelecomManager.CALL_SOURCE_UNSPECIFIED;

    public static final int CALL_SOURCE_EMERGENCY_DIALPAD =

            ParcelableCallAnalytics.CALL_SOURCE_EMERGENCY_DIALPAD;

            TelecomManager.CALL_SOURCE_EMERGENCY_DIALPAD;

    public static final int CALL_SOURCE_EMERGENCY_SHORTCUT =

            ParcelableCallAnalytics.CALL_SOURCE_EMERGENCY_SHORTCUT;

            TelecomManager.CALL_SOURCE_EMERGENCY_SHORTCUT;



    // Constants for video events

    public static final int SEND_LOCAL_SESSION_MODIFY_REQUEST =

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

+4 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,10 @@ public class CallsManager extends Call.ListenerBase 
                }

            }



            if (extras.getBoolean(PhoneAccount.EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE)) {

            Bundle phoneAccountExtras = phoneAccount.getExtras();

            if (phoneAccountExtras != null

                    && phoneAccountExtras.getBoolean(

                            PhoneAccount.EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE)) {

                Log.d(this, "processIncomingCallIntent: defaulting to voip mode for call %s",

                        call.getId());

                call.setIsVoipAudioMode(true);