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

Commit cd5a1e16 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Add null check for use getSimCallManagerFromCall am: af33e6d4 am: 03a60319 

Change-Id: I5280dcd98d71c8c807655f91594fa93ee1ace6c3
parents bb6818bc 03a60319

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ final class CreateConnectionTimeout extends Runnable { 
        }



        // Timeout is only supported for SIM call managers that are set by the carrier.

        if (!Objects.equals(connectionManager.getComponentName(),

        if (connectionManager != null && !Objects.equals(connectionManager.getComponentName(),

                mPhoneAccountRegistrar.getSystemSimCallManagerComponent())) {

            Log.d(this, "isTimeoutNeededForCall, not a system sim call manager");

            return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ public class InCallController extends CallsManagerListenerBase { 
            // The call was regular but it is now external.  We must now remove it from any

            // InCallServices which do not support external calls.

            // Remove the call by sending a call update indicating the call was disconnected.

            Log.i(this, "Removing external call %", call);

            Log.i(this, "Removing external call %s", call);

            for (Map.Entry<InCallServiceInfo, IInCallService> entry : mInCallServices.entrySet()) {

                InCallServiceInfo info = entry.getKey();

                if (info.isExternalCallsSupported()) {

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.telecom; 


import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -493,6 +494,7 @@ public class PhoneAccountRegistrar { 
     * target phone account.

     * @return phone account handle of sim call manager based on the ongoing call.

     */

    @Nullable

    public PhoneAccountHandle getSimCallManagerFromCall(Call call) {

        if (call == null) {

            return null;