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

Commit 639dbe21 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Adds better logging for ImsFeature features" am: 4c5cd98c am:... 

Merge "Adds better logging for ImsFeature features" am: 4c5cd98c am: cb258ecb am: 6a81d392 am: 5c2b2305
am: 49943c55

Change-Id: I81bf616797f79133c4e8a5a128248c8669d1b8d3
parents 65ee6a33 49943c55

telephony/java/android/telephony/ims/feature/ImsFeature.java

+22 −0
Original line number Original line Diff line number Diff line
@@ -34,7 +34,9 @@ import com.android.internal.annotations.VisibleForTesting; 
import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.util.Collections;

import java.util.Collections;

import java.util.HashMap;

import java.util.Iterator;

import java.util.Iterator;

import java.util.Map;

import java.util.Set;

import java.util.Set;

import java.util.WeakHashMap;

import java.util.WeakHashMap;
@@ -105,6 +107,16 @@ public abstract class ImsFeature { 
     */

     */

    public static final int FEATURE_MAX = 3;

    public static final int FEATURE_MAX = 3;





    /**

     * Used for logging purposes.

     * @hide

     */

    public static final Map<Integer, String> FEATURE_LOG_MAP = new HashMap<Integer, String>() {{

            put(FEATURE_EMERGENCY_MMTEL, "EMERGENCY_MMTEL");

            put(FEATURE_MMTEL, "MMTEL");

            put(FEATURE_RCS, "RCS");

        }};



    /**

    /**

     * Integer values defining IMS features that are supported in ImsFeature.

     * Integer values defining IMS features that are supported in ImsFeature.

     * @hide

     * @hide
@@ -149,6 +161,16 @@ public abstract class ImsFeature { 
     */

     */

    public static final int STATE_READY = 2;

    public static final int STATE_READY = 2;





    /**

     * Used for logging purposes.

     * @hide

     */

    public static final Map<Integer, String> STATE_LOG_MAP = new HashMap<Integer, String>() {{

            put(STATE_UNAVAILABLE, "UNAVAILABLE");

            put(STATE_INITIALIZING, "INITIALIZING");

            put(STATE_READY, "READY");

        }};



    /**

    /**

     * Integer values defining the result codes that should be returned from

     * Integer values defining the result codes that should be returned from

     * {@link #changeEnabledCapabilities} when the framework tries to set a feature's capability.

     * {@link #changeEnabledCapabilities} when the framework tries to set a feature's capability.

telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.Parcelable;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.ImsFeature;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Pair;





import java.util.Set;

import java.util.Set;
@@ -80,7 +79,7 @@ public final class ImsFeatureConfiguration implements Parcelable { 




        @Override

        @Override

        public String toString() {

        public String toString() {

            return "{s=" + slotId + ", f=" + featureType + "}";

            return "{s=" + slotId + ", f=" + ImsFeature.FEATURE_LOG_MAP.get(featureType) + "}";

        }

        }

    }

    }