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

Commit 41f4300b authored by rambowang's avatar rambowang
Browse files

Clean up 24Q3 aconfig flag DATA_ONLY_CELLULAR_SERVICE 

Bug: 296097429
Test: m -j
Flag: EXEMPT clean up
Change-Id: I90ebfa55a3bbd52ce534ff25a9bbf26d1bbc249f
parent 202605ec

core/api/current.txt

+7 −7
Original line number Original line Diff line number Diff line
@@ -43899,7 +43899,7 @@ package android.telephony { 
    field public static final String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field public static final String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public static final String KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY = "cellular_service_capabilities_int_array";

    field public static final String KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY = "cellular_service_capabilities_int_array";

    field public static final String KEY_CELLULAR_USAGE_SETTING_INT = "cellular_usage_setting_int";

    field public static final String KEY_CELLULAR_USAGE_SETTING_INT = "cellular_usage_setting_int";

    field public static final String KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL = "check_pricing_with_carrier_data_roaming_bool";

    field public static final String KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL = "check_pricing_with_carrier_data_roaming_bool";

    field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";

    field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";
@@ -45936,7 +45936,7 @@ package android.telephony { 
    method @Nullable public String getMncString();

    method @Nullable public String getMncString();

    method @Deprecated public String getNumber();

    method @Deprecated public String getNumber();

    method public int getPortIndex();

    method public int getPortIndex();

    method @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") @NonNull public java.util.Set<java.lang.Integer> getServiceCapabilities();

    method @NonNull public java.util.Set<java.lang.Integer> getServiceCapabilities();

    method public int getSimSlotIndex();

    method public int getSimSlotIndex();

    method public int getSubscriptionId();

    method public int getSubscriptionId();

    method public int getSubscriptionType();

    method public int getSubscriptionType();
@@ -46019,9 +46019,9 @@ package android.telephony { 
    field public static final int PHONE_NUMBER_SOURCE_CARRIER = 2; // 0x2

    field public static final int PHONE_NUMBER_SOURCE_CARRIER = 2; // 0x2

    field public static final int PHONE_NUMBER_SOURCE_IMS = 3; // 0x3

    field public static final int PHONE_NUMBER_SOURCE_IMS = 3; // 0x3

    field public static final int PHONE_NUMBER_SOURCE_UICC = 1; // 0x1

    field public static final int PHONE_NUMBER_SOURCE_UICC = 1; // 0x1

    field @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public static final int SERVICE_CAPABILITY_DATA = 3; // 0x3

    field public static final int SERVICE_CAPABILITY_DATA = 3; // 0x3

    field @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public static final int SERVICE_CAPABILITY_SMS = 2; // 0x2

    field public static final int SERVICE_CAPABILITY_SMS = 2; // 0x2

    field @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public static final int SERVICE_CAPABILITY_VOICE = 1; // 0x1

    field public static final int SERVICE_CAPABILITY_VOICE = 1; // 0x1

    field public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0; // 0x0

    field public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0; // 0x0

    field public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1; // 0x1

    field public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1; // 0x1

    field public static final int USAGE_SETTING_DATA_CENTRIC = 2; // 0x2

    field public static final int USAGE_SETTING_DATA_CENTRIC = 2; // 0x2
@@ -46270,8 +46270,8 @@ package android.telephony { 
    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabledForReason(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabledForReason(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataRoamingEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataRoamingEnabled();

    method @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public boolean isDeviceSmsCapable();

    method public boolean isDeviceSmsCapable();

    method @FlaggedApi("com.android.internal.telephony.flags.data_only_cellular_service") public boolean isDeviceVoiceCapable();

    method public boolean isDeviceVoiceCapable();

    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isHearingAidCompatibilitySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();

telephony/java/android/telephony/CarrierConfigManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -10558,7 +10558,6 @@ public class CarrierConfigManager { 
     * @see SubscriptionInfo#getServiceCapabilities()

     * @see SubscriptionInfo#getServiceCapabilities()

     * @see SubscriptionManager.OnSubscriptionsChangedListener

     * @see SubscriptionManager.OnSubscriptionsChangedListener

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public static final String KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY =

    public static final String KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY =

            "cellular_service_capabilities_int_array";

            "cellular_service_capabilities_int_array";

   /**

   /**

telephony/java/android/telephony/SubscriptionInfo.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -951,7 +951,6 @@ public class SubscriptionInfo implements Parcelable { 
     * @see SubscriptionManager#SERVICE_CAPABILITY_DATA

     * @see SubscriptionManager#SERVICE_CAPABILITY_DATA

     */

     */

    @NonNull

    @NonNull

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public @SubscriptionManager.ServiceCapability Set<Integer> getServiceCapabilities() {

    public @SubscriptionManager.ServiceCapability Set<Integer> getServiceCapabilities() {

        return SubscriptionManager.getServiceCapabilitiesSet(mServiceCapabilities);

        return SubscriptionManager.getServiceCapabilitiesSet(mServiceCapabilities);

    }

    }
@@ -1829,7 +1828,6 @@ public class SubscriptionInfo implements Parcelable { 
         * @throws IllegalArgumentException when any capability is not supported.

         * @throws IllegalArgumentException when any capability is not supported.

         */

         */

        @NonNull

        @NonNull

        @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

        public Builder setServiceCapabilities(

        public Builder setServiceCapabilities(

                @NonNull @SubscriptionManager.ServiceCapability Set<Integer> capabilities) {

                @NonNull @SubscriptionManager.ServiceCapability Set<Integer> capabilities) {

            int combinedCapabilities = 0;

            int combinedCapabilities = 0;

telephony/java/android/telephony/SubscriptionManager.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -1422,7 +1422,6 @@ public class SubscriptionManager { 
     *

     *

     * @see TelephonyManager#isDeviceVoiceCapable()

     * @see TelephonyManager#isDeviceVoiceCapable()

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public static final int SERVICE_CAPABILITY_VOICE = 1;

    public static final int SERVICE_CAPABILITY_VOICE = 1;





    /**

    /**
@@ -1440,13 +1439,11 @@ public class SubscriptionManager { 
     *

     *

     * @see TelephonyManager#isDeviceSmsCapable()

     * @see TelephonyManager#isDeviceSmsCapable()

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public static final int SERVICE_CAPABILITY_SMS = 2;

    public static final int SERVICE_CAPABILITY_SMS = 2;





    /**

    /**

     * Represents a value indicating the data calling capabilities of a subscription.

     * Represents a value indicating the data calling capabilities of a subscription.

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public static final int SERVICE_CAPABILITY_DATA = 3;

    public static final int SERVICE_CAPABILITY_DATA = 3;





    /**

    /**

telephony/java/android/telephony/TelephonyManager.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -6934,7 +6934,6 @@ public class TelephonyManager { 
     *

     *

     * @see SubscriptionInfo#getServiceCapabilities()

     * @see SubscriptionInfo#getServiceCapabilities()

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public boolean isDeviceVoiceCapable() {

    public boolean isDeviceVoiceCapable() {

        return isVoiceCapable();

        return isVoiceCapable();

    }

    }
@@ -6974,7 +6973,6 @@ public class TelephonyManager { 
     *

     *

     * @see SubscriptionInfo#getServiceCapabilities()

     * @see SubscriptionInfo#getServiceCapabilities()

     */

     */

    @FlaggedApi(Flags.FLAG_DATA_ONLY_CELLULAR_SERVICE)

    public boolean isDeviceSmsCapable() {

    public boolean isDeviceSmsCapable() {

        return isSmsCapable();

        return isSmsCapable();

    }

    }