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

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

Fix import of Rlog - generated by formatting tool am: e2acb8c2 am: 007e0596 

Change-Id: I2544ee4b5e98b782f7fb846f1280d44bfb24487f
parents 79f17944 007e0596

src/java/com/android/ims/FeatureConnection.java

+0 −4
Original line number Diff line number Diff line
@@ -23,19 +23,15 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.RemoteException;

import android.telephony.TelephonyManager;

import android.telephony.ims.aidl.IImsMmTelFeature;

import android.telephony.ims.aidl.IImsRcsFeature;

import android.telephony.ims.aidl.IImsRegistration;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import com.android.telephony.Rlog;

import android.util.Log;



import com.android.ims.internal.IImsServiceFeatureCallback;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.util.HandlerExecutor;





import java.util.concurrent.Executor;



/**

src/java/com/android/ims/FeatureConnector.java

+1 −1
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.os.Handler;

import android.os.Looper;

import com.android.telephony.Rlog;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.feature.ImsFeature;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.util.HandlerExecutor;

import com.android.telephony.Rlog;



import java.util.concurrent.Executor;

src/java/com/android/ims/ImsCall.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.os.Parcel; 
import android.telecom.Call;

import android.telecom.Connection;

import android.telephony.CallQuality;

import com.android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;
@@ -41,6 +40,7 @@ import com.android.ims.internal.ConferenceParticipant; 
import com.android.ims.internal.ICall;

import com.android.ims.internal.ImsStreamMediaSession;

import com.android.internal.annotations.VisibleForTesting;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Iterator;

src/java/com/android/ims/ImsEcbm.java

+1 −1
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ package com.android.ims; 


import android.compat.annotation.UnsupportedAppUsage;

import android.os.RemoteException;

import com.android.telephony.Rlog;

import android.telephony.ims.ImsReasonInfo;



import com.android.ims.internal.IImsEcbm;

import com.android.ims.internal.IImsEcbmListener;

import com.android.telephony.Rlog;



/**

 * Provides APIs for the supplementary service settings using IMS (Ut interface).

src/java/com/android/ims/ImsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.provider.Settings; 
import android.telecom.TelecomManager;

import android.telephony.AccessNetworkConstants;

import android.telephony.CarrierConfigManager;

import com.android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;
@@ -63,6 +62,7 @@ import com.android.ims.internal.IImsUt; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.util.HandlerExecutor;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;