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

Commit 818822ad authored by Derek Tan's avatar Derek Tan
Browse files

Per API review, revert the API renaming CL. 

Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b56.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
parent 3bf26b56

api/current.txt

+2 −4
Original line number Diff line number Diff line
@@ -36509,11 +36509,9 @@ package android.telecom { 
package android.telephony {















  public class CarrierConfigManager {













    method public android.os.PersistableBundle getConfig(int);















    method public android.os.PersistableBundle getConfig();













    method public deprecated android.os.PersistableBundle getConfigForSubId(int);













    method public void notifyConfigChanged(int);













    method public deprecated void notifyConfigChangedForSubId(int);













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













    method public void notifyConfigChangedForSubId(int);















    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";















    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";















    field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";

























api/system-current.txt



+2
−4




























Original line number
Diff line number
Diff line








@@ -39224,12 +39224,10 @@ package android.telecom {













package android.telephony {





























  public class CarrierConfigManager {













    method public android.os.PersistableBundle getConfig(int);















    method public android.os.PersistableBundle getConfig();













    method public deprecated android.os.PersistableBundle getConfigForSubId(int);













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















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













    method public void notifyConfigChanged(int);













    method public deprecated void notifyConfigChangedForSubId(int);













    method public void notifyConfigChangedForSubId(int);















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















    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";















    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";

























api/test-current.txt



+2
−4




























Original line number
Diff line number
Diff line








@@ -36524,11 +36524,9 @@ package android.telecom {













package android.telephony {





























  public class CarrierConfigManager {













    method public android.os.PersistableBundle getConfig(int);















    method public android.os.PersistableBundle getConfig();













    method public deprecated android.os.PersistableBundle getConfigForSubId(int);













    method public void notifyConfigChanged(int);













    method public deprecated void notifyConfigChangedForSubId(int);













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













    method public void notifyConfigChangedForSubId(int);















    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";















    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";















    field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";

























telephony/java/android/telephony/CarrierConfigManager.java



+2
−42




























Original line number
Diff line number
Diff line








@@ -733,28 +733,9 @@ public class CarrierConfigManager {













     * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}.















     * @return A {@link PersistableBundle} containing the config for the given subId, or default















     *         values for an invalid subId.













     *













     * @deprecated use getConfig.















     */















    @Nullable















    public PersistableBundle getConfigForSubId(int subId) {













        return getConfig(subId);













    }



























    /**













     * Gets the configuration values for a particular subscription, which is associated with a













     * specific SIM card. If an invalid subId is used, the returned config will contain default













     * values.













     *













     * <p>Requires Permission:













     * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}













     *













     * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}.













     * @return A {@link PersistableBundle} containing the config for the given subId, or default













     *         values for an invalid subId.













     */













    @Nullable













    public PersistableBundle getConfig(int subId) {















        try {















            ICarrierConfigLoader loader = getICarrierConfigLoader();















            if (loader == null) {









@@ -776,11 +757,11 @@ public class CarrierConfigManager {













     * <p>Requires Permission:















     * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}















     *













     * @return A {@link PersistableBundle} containing the config for the default subscription.













     * @see #getConfigForSubId















     */















    @Nullable















    public PersistableBundle getConfig() {













        return getConfig(SubscriptionManager.getDefaultSubscriptionId());













        return getConfigForSubId(SubscriptionManager.getDefaultSubscriptionId());















    }































    /**









@@ -797,29 +778,8 @@ public class CarrierConfigManager {













     * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an















     * arbitrary thread.















     * </p>













     *













     * @deprecated use notifyConfigChanged.















     */















    public void notifyConfigChangedForSubId(int subId) {













        notifyConfigChanged(subId);













    }



























    /**













     * Calling this method triggers telephony services to fetch the current carrier configuration.













     * <p>













     * Normally this does not need to be called because the platform reloads config on its own.













     * This should be called by a carrier service app if it wants to update config at an arbitrary













     * moment.













     * </p>













     * <p>Requires that the calling app has carrier privileges.













     * @see #hasCarrierPrivileges













     * <p>













     * This method returns before the reload has completed, and













     * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an













     * arbitrary thread.













     * </p>













     */













    public void notifyConfigChanged(int subId) {















        try {















            ICarrierConfigLoader loader = getICarrierConfigLoader();















            if (loader == null) {