diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index 3bec8b000bb71..8f8989909f9ff 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -34,7 +34,9 @@ import com.android.internal.annotations.VisibleForTesting; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Set; import java.util.WeakHashMap; @@ -105,6 +107,16 @@ public abstract class ImsFeature { */ public static final int FEATURE_MAX = 3; + /** + * Used for logging purposes. + * @hide + */ + public static final Map FEATURE_LOG_MAP = new HashMap() {{ + put(FEATURE_EMERGENCY_MMTEL, "EMERGENCY_MMTEL"); + put(FEATURE_MMTEL, "MMTEL"); + put(FEATURE_RCS, "RCS"); + }}; + /** * Integer values defining IMS features that are supported in ImsFeature. * @hide @@ -149,6 +161,16 @@ public abstract class ImsFeature { */ public static final int STATE_READY = 2; + /** + * Used for logging purposes. + * @hide + */ + public static final Map STATE_LOG_MAP = new HashMap() {{ + put(STATE_UNAVAILABLE, "UNAVAILABLE"); + put(STATE_INITIALIZING, "INITIALIZING"); + put(STATE_READY, "READY"); + }}; + /** * Integer values defining the result codes that should be returned from * {@link #changeEnabledCapabilities} when the framework tries to set a feature's capability. diff --git a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java index 6ab9465908994..3b298bb82f8bf 100644 --- a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java +++ b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java @@ -21,7 +21,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.telephony.ims.feature.ImsFeature; import android.util.ArraySet; -import android.util.Pair; import java.util.Set; @@ -80,7 +79,7 @@ public final class ImsFeatureConfiguration implements Parcelable { @Override public String toString() { - return "{s=" + slotId + ", f=" + featureType + "}"; + return "{s=" + slotId + ", f=" + ImsFeature.FEATURE_LOG_MAP.get(featureType) + "}"; } }