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

Commit 007e0596 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I7f97c25ffbfc1408a8d1668e5226a438144bf686
parents 64aa630e e2acb8c2
Loading
Loading
Loading
Loading
+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;

/**
+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;

+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;
+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).
+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;
Loading