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

Commit 3031bf96 authored by Jonathan Basseri's avatar Jonathan Basseri
Browse files

Adding Carrier Config API. 

UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
parent 1cf9b6be

Android.mk

+7 −4
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IUpdateLock.aidl \

	core/java/android/os/IUserManager.aidl \

	core/java/android/os/IVibratorService.aidl \

	core/java/android/service/carrier/ICarrierConfigService.aidl \

	core/java/android/service/carrier/ICarrierMessagingCallback.aidl \

	core/java/android/service/carrier/ICarrierMessagingService.aidl \

	core/java/android/service/notification/INotificationListener.aidl \
@@ -374,15 +375,16 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl \

	telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl \

	telephony/java/com/android/ims/ImsConfigListener.aidl \

	telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \

	telephony/java/com/android/internal/telephony/IMms.aidl \

	telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	telephony/java/com/android/internal/telephony/ISms.aidl \

	telephony/java/com/android/internal/telephony/ISub.aidl \

	telephony/java/com/android/internal/telephony/ITelephony.aidl \

	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \

	telephony/java/com/android/internal/telephony/ISms.aidl \

	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \

	telephony/java/com/android/internal/telephony/ISub.aidl \

	telephony/java/com/android/internal/telephony/IMms.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl \

	wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \

	wifi/java/android/net/wifi/IWifiScanner.aidl \
@@ -529,6 +531,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \

	frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \

	frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \

	frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \

	frameworks/base/core/java/android/speech/tts/Voice.aidl \

api/current.txt

+35 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android { 
    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";

    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

    field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE";

    field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";

    field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";

    field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
@@ -7263,6 +7264,7 @@ package android.content { 
    field public static final java.lang.String BLUETOOTH_SERVICE = "bluetooth";

    field public static final java.lang.String CAMERA_SERVICE = "camera";

    field public static final java.lang.String CAPTIONING_SERVICE = "captioning";

    field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";

    field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";

    field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";

    field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
@@ -27019,6 +27021,26 @@ package android.security { 














package android.service.carrier {



























  public abstract class CarrierConfigService extends android.app.Service {













    ctor public CarrierConfigService();













    method public final android.os.IBinder onBind(android.content.Intent);













    method public abstract android.os.Bundle onLoadConfig(android.service.carrier.CarrierIdentifier);













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService";













  }

























  public class CarrierIdentifier implements android.os.Parcelable {













    ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);













    method public int describeContents();













    method public java.lang.String getGid1();













    method public java.lang.String getGid2();













    method public java.lang.String getImsi();













    method public java.lang.String getMcc();













    method public java.lang.String getMnc();













    method public java.lang.String getSpn();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.service.carrier.CarrierIdentifier> CREATOR;













  }



























  public abstract class CarrierMessagingService extends android.app.Service {















    ctor public CarrierMessagingService();















    method public android.os.IBinder onBind(android.content.Intent);










@@ -28883,6 +28905,19 @@ package android.telecom {



























package android.telephony {



























  public class CarrierConfigManager {













    ctor public CarrierConfigManager();













    method public android.os.Bundle getConfig();













    method public android.os.Bundle getConfigForSubId(int);













    method public void reloadCarrierConfigForSubId(int);













    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.intent.action.carrier_config_changed";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";













    field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";













    field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";













  }



























  public final class CellIdentityCdma implements android.os.Parcelable {















    method public int describeContents();















    method public int getBasestationId();

























api/system-current.txt



+37
−0




























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ package android {













    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";















    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";















    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";













    field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE";















    field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";















    field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE";















    field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";










@@ -7504,6 +7505,7 @@ package android.content {













    field public static final java.lang.String BLUETOOTH_SERVICE = "bluetooth";















    field public static final java.lang.String CAMERA_SERVICE = "camera";















    field public static final java.lang.String CAPTIONING_SERVICE = "captioning";













    field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";















    field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";















    field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";















    field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";










@@ -28716,6 +28718,26 @@ package android.security {



























package android.service.carrier {



























  public abstract class CarrierConfigService extends android.app.Service {













    ctor public CarrierConfigService();













    method public final android.os.IBinder onBind(android.content.Intent);













    method public abstract android.os.Bundle onLoadConfig(android.service.carrier.CarrierIdentifier);













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService";













  }

























  public class CarrierIdentifier implements android.os.Parcelable {













    ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);













    method public int describeContents();













    method public java.lang.String getGid1();













    method public java.lang.String getGid2();













    method public java.lang.String getImsi();













    method public java.lang.String getMcc();













    method public java.lang.String getMnc();













    method public java.lang.String getSpn();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.service.carrier.CarrierIdentifier> CREATOR;













  }



























  public abstract class CarrierMessagingService extends android.app.Service {















    ctor public CarrierMessagingService();















    method public android.os.IBinder onBind(android.content.Intent);










@@ -30720,6 +30742,21 @@ package android.telecom {



























package android.telephony {



























  public class CarrierConfigManager {













    ctor public CarrierConfigManager();













    method public android.os.Bundle getConfig();













    method public android.os.Bundle getConfigForSubId(int);













    method public static android.os.Bundle getDefaultConfig();













    method public void reloadCarrierConfigForSubId(int);













    method public void updateConfigForPhoneId(int, java.lang.String);













    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.intent.action.carrier_config_changed";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";













    field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";













    field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";













    field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";













  }



























  public final class CellIdentityCdma implements android.os.Parcelable {















    method public int describeContents();















    method public int getBasestationId();

























core/java/android/app/ContextImpl.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -125,6 +125,7 @@ import android.print.PrintManager;













import android.service.fingerprint.IFingerprintService;















import android.service.fingerprint.FingerprintManager;















import android.telecom.TelecomManager;













import android.telephony.CarrierConfigManager;















import android.telephony.SubscriptionManager;















import android.telephony.TelephonyManager;















import android.content.ClipboardManager;










@@ -768,6 +769,12 @@ class ContextImpl extends Context {













                IBinder b = ServiceManager.getService(APPWIDGET_SERVICE);















                return new AppWidgetManager(ctx, IAppWidgetService.Stub.asInterface(b));















            }});



























        registerService(CARRIER_CONFIG_SERVICE, new ServiceFetcher() {













            public Object createService(ContextImpl ctx) {













                return new CarrierConfigManager();













            }













        });















    }































    static ContextImpl getImpl(Context context) {

































core/java/android/content/Context.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -2116,6 +2116,7 @@ public abstract class Context {













            AUDIO_SERVICE,















            MEDIA_ROUTER_SERVICE,















            TELEPHONY_SERVICE,













            CARRIER_CONFIG_SERVICE,















            TELECOM_SERVICE,















            CLIPBOARD_SERVICE,















            INPUT_METHOD_SERVICE,










@@ -2248,6 +2249,8 @@ public abstract class Context {













     * @see android.telephony.TelephonyManager















     * @see #TELEPHONY_SUBSCRIPTION_SERVICE















     * @see android.telephony.SubscriptionManager













     * @see #CARRIER_CONFIG_SERVICE













     * @see android.telephony.CarrierConfigManager















     * @see #INPUT_METHOD_SERVICE















     * @see android.view.inputmethod.InputMethodManager















     * @see #UI_MODE_SERVICE










@@ -2610,6 +2613,15 @@ public abstract class Context {













     */















    public static final String TELECOM_SERVICE = "telecom";





























    /**













     * Use with {@link #getSystemService} to retrieve a













     * {@link android.telephony.CarrierConfigManager} for reading carrier configuration values.













     *













     * @see #getSystemService













     * @see android.telephony.CarrierConfigManager













     */













    public static final String CARRIER_CONFIG_SERVICE = "carrier_config";





























    /**















     * Use with {@link #getSystemService} to retrieve a















     * {@link android.text.ClipboardManager} for accessing and modifying