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

Commit b0f00c60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use com.android.telephony.Rlog for mainline module."

parents fe141b35 8cdf3bcf

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

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ package com.android.internal.telephony; 
import android.content.Context;

import android.os.AsyncTask;

import android.provider.BlockedNumberContract;

import android.telephony.Rlog;



import com.android.telephony.Rlog;



/**

 * An {@link AsyncTask} that notifies the Blocked number provider that emergency services were

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

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ package com.android.internal.telephony; 
import android.content.Context;

import android.os.Bundle;

import android.provider.BlockedNumberContract;

import android.telephony.Rlog;



import com.android.telephony.Rlog;



/**

 * {@hide} Checks for blocked phone numbers against {@link BlockedNumberContract}

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

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



import android.compat.annotation.UnsupportedAppUsage;

import android.telephony.Rlog;



import com.android.ims.internal.ConferenceParticipant;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.List;

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

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



import android.compat.annotation.UnsupportedAppUsage;

import android.telephony.Rlog;



import com.android.telephony.Rlog;



/**

 * See also RIL_CallForwardInfo in include/telephony/ril.h

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

+1 −3
Original line number Diff line number Diff line
@@ -25,18 +25,16 @@ import android.os.Registrant; 
import android.os.RegistrantList;

import android.telephony.PhoneNumberUtils;

import android.telephony.PhoneStateListener;

import android.telephony.Rlog;

import android.telephony.ServiceState;



import com.android.internal.telephony.sip.SipPhone;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;







/**

 * @hide

 *