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

Commit 1b99428e authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix usages of @hide APIs in Telephony from Telecom" 

am: 83878322

Change-Id: Ie30fd912b19f852103f5354b30d2e04fd3ef25ea
parents 40dba6c8 83878322

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

+3 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class BluetoothPhoneServiceImpl { 
                        return account.getLabel().toString();

                    } else {

                        // Finally, just get the network name from telephony.

                        return TelephonyManager.from(mContext)

                        return mContext.getSystemService(TelephonyManager.class)

                                .getNetworkOperatorName();

                    }

                } finally {
@@ -203,7 +203,8 @@ public class BluetoothPhoneServiceImpl { 
                        }

                    }

                    if (TextUtils.isEmpty(address)) {

                        address = TelephonyManager.from(mContext).getLine1Number();

                        address = mContext.getSystemService(TelephonyManager.class)

                                .getLine1Number();

                        if (address == null) address = "";

                    }

                    return address;

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

+4 −6
Original line number Diff line number Diff line
@@ -30,12 +30,14 @@ import android.os.Parcelable; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.provider.ContactsContract.Contacts;

import android.telecom.CallAudioState;

import android.telecom.CallerInfo;

import android.telecom.Conference;

import android.telecom.Connection;

import android.telecom.ConnectionService;

import android.telecom.DisconnectCause;

import android.telecom.Connection;

import android.telecom.GatewayInfo;

import android.telecom.Log;

import android.telecom.Logging.EventManager;
@@ -51,17 +53,13 @@ import android.telephony.TelephonyManager; 
import android.telephony.emergency.EmergencyNumber;

import android.text.TextUtils;

import android.util.StatsLog;

import android.os.UserHandle;

import android.widget.Toast;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telecom.IVideoProvider;

import android.telephony.CallerInfo;

import com.android.internal.telephony.SmsApplication;

import com.android.internal.util.Preconditions;



import java.io.IOException;

import java.lang.String;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Collection;
@@ -2649,7 +2647,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        }



        // Is there a valid SMS application on the phone?

        if (SmsApplication.getDefaultRespondViaMessageApplication(mContext,

        if (TelephonyManager.getDefaultRespondViaMessageApplication(mContext,

                true /*updateIfNeeded*/) == null) {

            return false;

        }

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

+7 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import android.telephony.SubscriptionManager; 


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

import com.android.internal.annotations.VisibleForTesting;

import android.telephony.CallerInfo;

import android.telecom.CallerInfo;

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



import java.util.Arrays;
@@ -131,6 +131,11 @@ public final class CallLogManager extends CallsManagerListenerBase { 


    private static final String TAG = CallLogManager.class.getSimpleName();



    // Copied from android.telephony.DisconnectCause.toString

    // TODO: come up with a better way to indicate in a android.telecom.DisconnectCause that

    // a conference was merged successfully

    private static final String REASON_IMS_MERGED_SUCCESSFULLY = "IMS_MERGED_SUCCESSFULLY";



    private final Context mContext;

    private final CarrierConfigManager mCarrierConfigManager;

    private final PhoneAccountRegistrar mPhoneAccountRegistrar;
@@ -252,9 +257,7 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        // Otherwise, fall through. Merged calls would be associated with disconnected

        // connections because of special carrier requirements. Those calls don't look like

        // merged, e.g. could be one active and the other on hold.

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

                android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY)

                .equals(cause.getReason())) {

        if (cause != null && REASON_IMS_MERGED_SUCCESSFULLY.equals(cause.getReason())) {

            int subscriptionId = mPhoneAccountRegistrar

                    .getSubscriptionIdForPhoneAccount(call.getTargetPhoneAccount());

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

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.server.telecom;



import android.telephony.CallerInfoAsyncQuery;

import android.telecom.CallerInfoAsyncQuery;



import android.content.Context;

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

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.text.TextUtils; 
import android.util.Pair;



import com.android.internal.annotations.VisibleForTesting;

import android.telephony.CallerInfo;

import android.telephony.CallerInfoAsyncQuery;

import android.telecom.CallerInfo;

import android.telecom.CallerInfoAsyncQuery;



import java.util.HashMap;

import java.util.LinkedList;