diff options
-rw-r--r-- | src/java/com/android/ims/FeatureConnection.java | 4 | ||||
-rw-r--r-- | src/java/com/android/ims/FeatureConnector.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsEcbm.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsMultiEndpoint.java | 8 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsUt.java | 8 | ||||
-rw-r--r-- | src/java/com/android/ims/MmTelFeatureConnection.java | 19 | ||||
-rw-r--r-- | src/java/com/android/ims/RcsFeatureConnection.java | 8 | ||||
-rw-r--r-- | src/java/com/android/ims/RcsFeatureManager.java | 6 | ||||
-rw-r--r-- | src/java/com/android/ims/internal/ConferenceParticipant.java | 4 |
11 files changed, 21 insertions, 44 deletions
diff --git a/src/java/com/android/ims/FeatureConnection.java b/src/java/com/android/ims/FeatureConnection.java index 61fe7328..158c55af 100644 --- a/src/java/com/android/ims/FeatureConnection.java +++ b/src/java/com/android/ims/FeatureConnection.java @@ -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; /** diff --git a/src/java/com/android/ims/FeatureConnector.java b/src/java/com/android/ims/FeatureConnector.java index 6b6dc60a..2f424842 100644 --- a/src/java/com/android/ims/FeatureConnector.java +++ b/src/java/com/android/ims/FeatureConnector.java @@ -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; diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 5ff6d361..d744d303 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -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; diff --git a/src/java/com/android/ims/ImsEcbm.java b/src/java/com/android/ims/ImsEcbm.java index 32162ebb..13a59256 100644 --- a/src/java/com/android/ims/ImsEcbm.java +++ b/src/java/com/android/ims/ImsEcbm.java @@ -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). diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index b6413cfd..7c31c560 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -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; diff --git a/src/java/com/android/ims/ImsMultiEndpoint.java b/src/java/com/android/ims/ImsMultiEndpoint.java index 8a094d26..dc297b6e 100644 --- a/src/java/com/android/ims/ImsMultiEndpoint.java +++ b/src/java/com/android/ims/ImsMultiEndpoint.java @@ -16,14 +16,14 @@ package com.android.ims; -import com.android.ims.internal.IImsMultiEndpoint; -import com.android.ims.internal.IImsExternalCallStateListener; - import android.os.RemoteException; -import com.android.telephony.Rlog; import android.telephony.ims.ImsExternalCallState; import android.telephony.ims.ImsReasonInfo; +import com.android.ims.internal.IImsExternalCallStateListener; +import com.android.ims.internal.IImsMultiEndpoint; +import com.android.telephony.Rlog; + import java.util.List; /** diff --git a/src/java/com/android/ims/ImsUt.java b/src/java/com/android/ims/ImsUt.java index 513b7a06..61a11111 100644 --- a/src/java/com/android/ims/ImsUt.java +++ b/src/java/com/android/ims/ImsUt.java @@ -16,9 +16,6 @@ package com.android.ims; -import java.util.HashMap; -import java.util.Map; - import android.content.res.Resources; import android.os.AsyncResult; import android.os.Bundle; @@ -26,7 +23,6 @@ import android.os.Handler; import android.os.Message; import android.os.Registrant; import android.os.RemoteException; -import com.android.telephony.Rlog; import android.telephony.ims.ImsCallForwardInfo; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.ImsSsData; @@ -36,6 +32,10 @@ import android.telephony.ims.ImsUtListener; import com.android.ims.internal.IImsUt; import com.android.ims.internal.IImsUtListener; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; + +import java.util.HashMap; +import java.util.Map; /** * Provides APIs for the supplementary service settings using IMS (Ut interface). diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java index c3080a57..2c10a238 100644 --- a/src/java/com/android/ims/MmTelFeatureConnection.java +++ b/src/java/com/android/ims/MmTelFeatureConnection.java @@ -17,17 +17,10 @@ package com.android.ims; import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.os.IBinder; -import android.os.IInterface; -import android.os.Looper; import android.os.Message; -import android.os.RemoteCallbackList; import android.os.RemoteException; -import com.android.telephony.Rlog; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsCallProfile; import android.telephony.ims.aidl.IImsCapabilityCallback; @@ -40,24 +33,14 @@ import android.telephony.ims.aidl.IImsSmsListener; import android.telephony.ims.feature.CapabilityChangeRequest; import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.MmTelFeature; -import android.telephony.ims.stub.ImsRegistrationImplBase; import android.telephony.ims.stub.ImsSmsImplBase; -import android.util.ArraySet; import android.util.Log; -import android.util.SparseArray; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsEcbm; import com.android.ims.internal.IImsMultiEndpoint; -import com.android.ims.internal.IImsServiceFeatureCallback; import com.android.ims.internal.IImsUt; -import com.android.internal.annotations.VisibleForTesting; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; +import com.android.telephony.Rlog; /** * A container of the IImsServiceController binder, which implements all of the ImsFeatures that diff --git a/src/java/com/android/ims/RcsFeatureConnection.java b/src/java/com/android/ims/RcsFeatureConnection.java index 714449d4..ea09e6fd 100644 --- a/src/java/com/android/ims/RcsFeatureConnection.java +++ b/src/java/com/android/ims/RcsFeatureConnection.java @@ -20,19 +20,19 @@ import android.annotation.NonNull; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; +import android.telephony.TelephonyManager; +import android.telephony.ims.RcsContactUceCapability; import android.telephony.ims.aidl.IImsCapabilityCallback; +import android.telephony.ims.aidl.IImsRcsFeature; import android.telephony.ims.aidl.IRcsFeatureListener; import android.telephony.ims.feature.CapabilityChangeRequest; import android.telephony.ims.feature.ImsFeature; -import android.telephony.ims.RcsContactUceCapability; -import com.android.telephony.Rlog; -import android.telephony.TelephonyManager; -import android.telephony.ims.aidl.IImsRcsFeature; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.service.ims.presence.PresencePublisher; import com.android.service.ims.presence.SubscribePublisher; +import com.android.telephony.Rlog; /** * A container of the IImsServiceController binder, which implements all of the RcsFeatures that diff --git a/src/java/com/android/ims/RcsFeatureManager.java b/src/java/com/android/ims/RcsFeatureManager.java index 41fc7184..1d8e6f1c 100644 --- a/src/java/com/android/ims/RcsFeatureManager.java +++ b/src/java/com/android/ims/RcsFeatureManager.java @@ -29,21 +29,21 @@ import android.telephony.ims.aidl.IImsCapabilityCallback; import android.telephony.ims.aidl.IImsRegistration; import android.telephony.ims.aidl.IImsRegistrationCallback; import android.telephony.ims.aidl.IRcsFeatureListener; -import android.telephony.ims.stub.ImsRegistrationImplBase; import android.telephony.ims.feature.CapabilityChangeRequest; import android.telephony.ims.feature.RcsFeature.RcsImsCapabilities; +import android.telephony.ims.stub.ImsRegistrationImplBase; import android.telephony.ims.stub.RcsPresenceExchangeImplBase; -import com.android.telephony.Rlog; import android.util.Log; import com.android.ims.FeatureConnection.IFeatureUpdate; import com.android.ims.RcsFeatureConnection.IRcsFeatureUpdate; import com.android.internal.annotations.VisibleForTesting; +import com.android.telephony.Rlog; import java.util.List; import java.util.Set; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; diff --git a/src/java/com/android/ims/internal/ConferenceParticipant.java b/src/java/com/android/ims/internal/ConferenceParticipant.java index 8ff1a179..12edd166 100644 --- a/src/java/com/android/ims/internal/ConferenceParticipant.java +++ b/src/java/com/android/ims/internal/ConferenceParticipant.java @@ -19,16 +19,14 @@ package com.android.ims.internal; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.telecom.Call; import android.telecom.Connection; -import android.telecom.ParcelableCall; import android.telecom.PhoneAccount; import android.telephony.PhoneNumberUtils; -import com.android.telephony.Rlog; import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.PhoneConstants; +import com.android.telephony.Rlog; /** * Parcelable representation of a participant's state in a conference call. |