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

Commit 8c3919f9 authored by Jayachandran C's avatar Jayachandran C
Browse files

Make DEFAULT_PREFERRED_NETWORK_MODE @hide for now 

This API also needs to expose the possible values which would need more
work hence we will drop this for now and re-work for next release

This CL also fixes a bug to use correct RIL constant

Bug: 148514283
Bug: 148484234
Test: Verified that the eSIM works on DSDS
      atest packages/services/Telephony/tests/
      atest frameworks/opt/telephony/tests/telephonytests/

Change-Id: Ifd7b17cc2445c9cbe4c6ba688838a1b07eb13599
parent 6d5c8929

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -12410,7 +12410,6 @@ package android.telephony { 
    field public static final int CDMA_SUBSCRIPTION_RUIM_SIM = 0; // 0x0

    field public static final int CDMA_SUBSCRIPTION_UNKNOWN = -1; // 0xffffffff

    field public static final int CHANGE_ICC_LOCK_SUCCESS = 2147483647; // 0x7fffffff

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

    field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION";

    field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID";

    field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto";

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -7761,9 +7761,8 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final int DEFAULT_PREFERRED_NETWORK_MODE =

            RILConstants.DEFAULT_PREFERRED_NETWORK_MODE;

            RILConstants.PREFERRED_NETWORK_MODE;



    /**

     * Get the preferred network type.

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −4
Original line number Diff line number Diff line
@@ -233,14 +233,11 @@ public interface RILConstants { 
    /** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */

    int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;



    /** Default preferred network mode */

    int DEFAULT_PREFERRED_NETWORK_MODE = NETWORK_MODE_WCDMA_PREF;



    @UnsupportedAppUsage

    int PREFERRED_NETWORK_MODE = Optional.of(TelephonyProperties.default_network())

            .filter(list -> !list.isEmpty())

            .map(list -> list.get(0))

            .orElse(DEFAULT_PREFERRED_NETWORK_MODE);

            .orElse(NETWORK_MODE_WCDMA_PREF);



    int BAND_MODE_UNSPECIFIED = 0;      //"unspecified" (selected by baseband automatically)

    int BAND_MODE_EURO = 1;             //"EURO band" (GSM-900 / DCS-1800 / WCDMA-IMT-2000)