PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02

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

Change-Id: I50899d08d1e6ed99987adaa6f21f65f0d0f198c6
This commit is contained in:
TreeHugger Robot
2021-07-12 10:48:12 +00:00
committed by Automerger Merge Worker
parent 4a0edbcc55 5ab7e41f02
commit 1faaefee9c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -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) {