CarrierConfig: get configs by prefix
Get configs using the prefix of components like gps, wifi or ims. Add a new ims class for configs related to ims stack. Bug: 132286782 Test: Build Change-Id: Ib20ac3b3c55156913284268439102fba7e96dad7
This commit is contained in:
@@ -42107,6 +42107,7 @@ package android.telephony {
|
|||||||
|
|
||||||
public class CarrierConfigManager {
|
public class CarrierConfigManager {
|
||||||
method @Nullable public android.os.PersistableBundle getConfig();
|
method @Nullable public android.os.PersistableBundle getConfig();
|
||||||
|
method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(String, int);
|
||||||
method @Nullable public android.os.PersistableBundle getConfigForSubId(int);
|
method @Nullable public android.os.PersistableBundle getConfigForSubId(int);
|
||||||
method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
|
method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
|
||||||
method public void notifyConfigChangedForSubId(int);
|
method public void notifyConfigChangedForSubId(int);
|
||||||
@@ -42284,6 +42285,10 @@ package android.telephony {
|
|||||||
field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
|
field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final class CarrierConfigManager.Ims {
|
||||||
|
field public static final String KEY_PREFIX = "ims.";
|
||||||
|
}
|
||||||
|
|
||||||
public abstract class CellIdentity implements android.os.Parcelable {
|
public abstract class CellIdentity implements android.os.Parcelable {
|
||||||
method public int describeContents();
|
method public int describeContents();
|
||||||
method @Nullable public CharSequence getOperatorAlphaLong();
|
method @Nullable public CharSequence getOperatorAlphaLong();
|
||||||
|
|||||||
@@ -2803,6 +2803,23 @@ public class CarrierConfigManager {
|
|||||||
public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =
|
public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =
|
||||||
"is_opportunistic_subscription_bool";
|
"is_opportunistic_subscription_bool";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configs used by the IMS stack.
|
||||||
|
*/
|
||||||
|
public static final class Ims {
|
||||||
|
/** Prefix of all Ims.KEY_* constants. */
|
||||||
|
public static final String KEY_PREFIX = "ims.";
|
||||||
|
|
||||||
|
//TODO: Add configs related to IMS.
|
||||||
|
|
||||||
|
private Ims() {}
|
||||||
|
|
||||||
|
private static PersistableBundle getDefaults() {
|
||||||
|
PersistableBundle defaults = new PersistableBundle();
|
||||||
|
return defaults;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of 4 GSM RSSI thresholds above which a signal level is considered POOR,
|
* A list of 4 GSM RSSI thresholds above which a signal level is considered POOR,
|
||||||
* MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting.
|
* MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting.
|
||||||
@@ -3227,6 +3244,7 @@ public class CarrierConfigManager {
|
|||||||
-89, /* SIGNAL_STRENGTH_GREAT */
|
-89, /* SIGNAL_STRENGTH_GREAT */
|
||||||
});
|
});
|
||||||
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
|
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
|
||||||
|
sDefaults.putAll(Ims.getDefaults());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -3423,4 +3441,75 @@ public class CarrierConfigManager {
|
|||||||
return ICarrierConfigLoader.Stub
|
return ICarrierConfigLoader.Stub
|
||||||
.asInterface(ServiceManager.getService(Context.CARRIER_CONFIG_SERVICE));
|
.asInterface(ServiceManager.getService(Context.CARRIER_CONFIG_SERVICE));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the configuration values for a component using its prefix.
|
||||||
|
*
|
||||||
|
* <p>Requires Permission:
|
||||||
|
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
|
||||||
|
*
|
||||||
|
* @param prefix prefix of the component.
|
||||||
|
* @param subId the subscription ID, normally obtained from {@link SubscriptionManager}.
|
||||||
|
*
|
||||||
|
* @see #getConfigForSubId
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
public PersistableBundle getConfigByComponentForSubId(String prefix, int subId) {
|
||||||
|
PersistableBundle configs = getConfigForSubId(subId);
|
||||||
|
|
||||||
|
if (configs == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
PersistableBundle ret = new PersistableBundle();
|
||||||
|
for (String configKey : configs.keySet()) {
|
||||||
|
if (configKey.startsWith(prefix)) {
|
||||||
|
addConfig(configKey, configs.get(configKey), ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addConfig(String key, Object value, PersistableBundle configs) {
|
||||||
|
if (value instanceof String) {
|
||||||
|
configs.putString(key, (String) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof String[]) {
|
||||||
|
configs.putStringArray(key, (String[]) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof Integer) {
|
||||||
|
configs.putInt(key, (Integer) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof Long) {
|
||||||
|
configs.putLong(key, (Long) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof Double) {
|
||||||
|
configs.putDouble(key, (Double) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof Boolean) {
|
||||||
|
configs.putBoolean(key, (Boolean) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof int[]) {
|
||||||
|
configs.putIntArray(key, (int[]) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof double[]) {
|
||||||
|
configs.putDoubleArray(key, (double[]) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof boolean[]) {
|
||||||
|
configs.putBooleanArray(key, (boolean[]) value);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value instanceof long[]) {
|
||||||
|
configs.putLongArray(key, (long[]) value);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user