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

Commit 2a40310a authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Telephony mainline updates." 

am: 1e530f68

Change-Id: If415bfd9102615849fba3aabfbdd188147832060
parents f1f4b7e5 1e530f68

src/java/com/android/internal/telephony/Call.java

+4 −3
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package com.android.internal.telephony;



import java.util.ArrayList;

import java.util.List;



import android.annotation.UnsupportedAppUsage;

import android.telecom.ConferenceParticipant;

import android.telephony.Rlog;



import java.util.ArrayList;

import java.util.List;

import com.android.ims.internal.ConferenceParticipant;



/**

 * {@hide}

src/java/com/android/internal/telephony/CallForwardInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony;



import android.annotation.UnsupportedAppUsage;

import android.telecom.Log;

import android.telephony.Rlog;



/**

 * See also RIL_CallForwardInfo in include/telephony/ril.h
@@ -49,6 +49,6 @@ public class CallForwardInfo { 
        return "[CallForwardInfo: status=" + (status == 0 ? " not active " : " active ")

                + ", reason= " + reason

                + ", serviceClass= " + serviceClass + ", timeSec= " + timeSeconds + " seconds"

                + ", number=" + Log.pii(number) + "]";

                + ", number=" + Rlog.pii(TAG, number) + "]";

    }

}

src/java/com/android/internal/telephony/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import android.annotation.UnsupportedAppUsage; 
import android.net.Uri;

import android.os.Bundle;

import android.os.SystemClock;

import android.telecom.ConferenceParticipant;

import android.telephony.DisconnectCause;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.emergency.EmergencyNumber;

import android.util.Log;



import com.android.ims.internal.ConferenceParticipant;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -4017,7 +4017,7 @@ public class GsmCdmaPhone extends Phone { 
     */

    private void loadTtyMode() {

        int ttyMode = TelecomManager.TTY_MODE_OFF;

        TelecomManager telecomManager = TelecomManager.from(mContext);

        TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);

        if (telecomManager != null) {

            ttyMode = telecomManager.getCurrentTtyMode();

        }

src/java/com/android/internal/telephony/imsphone/ImsPhoneCall.java

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
package com.android.internal.telephony.imsphone;



import android.annotation.UnsupportedAppUsage;

import android.telecom.ConferenceParticipant;

import com.android.ims.internal.ConferenceParticipant;

import android.telephony.Rlog;

import android.telephony.DisconnectCause;

import android.telephony.Rlog;

import android.telephony.ims.ImsStreamMediaProfile;