Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds better logging for ImsFeature features" am: 4c5cd98c53

Browse Source 
am: cb258ecb70

Change-Id: Ic08f1d7c4e417aa2a0f508b999dcdbb805838686
This commit is contained in:
Brad Ebinger
2019-08-06 15:24:01 -07:00
committed by android-build-merger
parent 01fe64a8d1 cb258ecb70
commit 6a81d39269
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telephony/java/android/telephony/ims/feature/ImsFeature.java
View File

@@ -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<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.
* @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<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
* {@link #changeEnabledCapabilities} when the framework tries to set a feature's capability.

3
telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java
View File

@@ -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) + "}";
}
}