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

Commit e47237f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f am: 04ab26b2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: Ifcf7e6ac5440bc12fc3e441e0f3fff848f0a81ba
parents 4e1cd46e 04ab26b2

src/com/android/settings/network/SubscriptionUtil.java

+4 −4
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class SubscriptionUtil { 
    }



    /**

     * Return a mapping of active subscription ids to diaplay names. Each display name is

     * Return a mapping of active subscription ids to display names. Each display name is

     * guaranteed to be unique in the following manner:

     * 1) If the original display name is not unique, the last four digits of the phone number

     *    will be appended.
@@ -237,7 +237,7 @@ public class SubscriptionUtil { 
     *    subscription, the subscription id will be appended to the original display name.

     * More details can be found at go/unique-sub-display-names.

     *

     * @return map of active subscription ids to diaplay names.

     * @return map of active subscription ids to display names.

     */

    @VisibleForTesting

    public static Map<Integer, CharSequence> getUniqueSubscriptionDisplayNames(Context context) {
@@ -328,7 +328,7 @@ public class SubscriptionUtil { 
     *    subscription, the subscription id will be appended to the original display name.

     * More details can be found at go/unique-sub-display-names.

     *

     * @return map of active subscription ids to diaplay names.

     * @return map of active subscription ids to display names.

     */

    @VisibleForTesting

    public static CharSequence getUniqueSubscriptionDisplayName(
@@ -346,7 +346,7 @@ public class SubscriptionUtil { 
     *    subscription, the subscription id will be appended to the original display name.

     * More details can be found at go/unique-sub-display-names.

     *

     * @return map of active subscription ids to diaplay names.

     * @return map of active subscription ids to display names.

     */

    public static CharSequence getUniqueSubscriptionDisplayName(

            SubscriptionInfo info, Context context) {