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

Commit 5c6eb0e7 authored by Jack Yu's avatar Jack Yu
Browse files

When SPN is empty, use PNN in mobile network settings 

Added one more name source 'PNN', which has priority
higher than carrier id but lower than EF_SPN.

Bug: 143493866
Test: Manual

Merged-In: I2ef14204d0db018e7f67578a57e56fdbea8b698c
Change-Id: I2ef14204d0db018e7f67578a57e56fdbea8b698c
(cherry picked from commit 9d95aff9)
parent 2bfa6b55

telephony/java/android/telephony/SubscriptionInfo.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -89,8 +89,8 @@ public class SubscriptionInfo implements Parcelable { 
    private int mCarrierId;

    private int mCarrierId;





    /**

    /**

     * The source of the name, NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SOURCE or

     * The source of the name, NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SPN,

     * NAME_SOURCE_USER_INPUT.

     * NAME_SOURCE_SIM_PNN, or NAME_SOURCE_USER_INPUT.

     */

     */

    private int mNameSource;

    private int mNameSource;
@@ -334,7 +334,7 @@ public class SubscriptionInfo implements Parcelable { 
    }

    }





    /**

    /**

     * @return the source of the name, eg NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SOURCE or

     * @return the source of the name, eg NAME_SOURCE_DEFAULT_SOURCE, NAME_SOURCE_SIM_SPN or

     * NAME_SOURCE_USER_INPUT.

     * NAME_SOURCE_USER_INPUT.

     * @hide

     * @hide

     */

     */

telephony/java/android/telephony/SubscriptionManager.java

+24 −7
Original line number Original line Diff line number Diff line
@@ -400,19 +400,19 @@ public class SubscriptionManager { 
    public static final String NAME_SOURCE = "name_source";

    public static final String NAME_SOURCE = "name_source";





    /**

    /**

     * The name_source is the default

     * The name_source is the default, which is from the carrier id.

     * @hide

     * @hide

     */

     */

    public static final int NAME_SOURCE_DEFAULT_SOURCE = 0;

    public static final int NAME_SOURCE_DEFAULT_SOURCE = 0;





    /**

    /**

     * The name_source is from the SIM

     * The name_source is from SIM EF_SPN.

     * @hide

     * @hide

     */

     */

    public static final int NAME_SOURCE_SIM_SOURCE = 1;

    public static final int NAME_SOURCE_SIM_SPN = 1;





    /**

    /**

     * The name_source is from the user

     * The name_source is from user input

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
@@ -424,6 +424,24 @@ public class SubscriptionManager { 
     */

     */

    public static final int NAME_SOURCE_CARRIER = 3;

    public static final int NAME_SOURCE_CARRIER = 3;





    /**

     * The name_source is from SIM EF_PNN.

     * @hide

     */

    public static final int NAME_SOURCE_SIM_PNN = 4;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"NAME_SOURCE_"},

            value = {

                    NAME_SOURCE_DEFAULT_SOURCE,

                    NAME_SOURCE_SIM_SPN,

                    NAME_SOURCE_USER_INPUT,

                    NAME_SOURCE_CARRIER,

                    NAME_SOURCE_SIM_PNN

            })

    public @interface SimDisplayNameSource {}



    /**

    /**

     * TelephonyProvider column name for the color of a SIM.

     * TelephonyProvider column name for the color of a SIM.

     * <P>Type: INTEGER (int)</P>

     * <P>Type: INTEGER (int)</P>
@@ -1660,13 +1678,12 @@ public class SubscriptionManager { 
     * Set display name by simInfo index with name source

     * Set display name by simInfo index with name source

     * @param displayName the display name of SIM card

     * @param displayName the display name of SIM card

     * @param subId the unique SubscriptionInfo index in database

     * @param subId the unique SubscriptionInfo index in database

     * @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE,

     * @param nameSource SIM display name source

     *                   2: NAME_SOURCE_USER_INPUT

     * @return the number of records updated or < 0 if invalid subId

     * @return the number of records updated or < 0 if invalid subId

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    public int setDisplayName(String displayName, int subId, int nameSource) {

    public int setDisplayName(String displayName, int subId, @SimDisplayNameSource int nameSource) {

        if (VDBG) {

        if (VDBG) {

            logd("[setDisplayName]+  displayName:" + displayName + " subId:" + subId

            logd("[setDisplayName]+  displayName:" + displayName + " subId:" + subId

                    + " nameSource:" + nameSource);

                    + " nameSource:" + nameSource);