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

Commit eeb5b9d0 authored by Tingting Wang's avatar Tingting Wang Committed by Android Git Automerger
Browse files

am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 

* commit '0f4595af':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
parents f2d70428 0f4595af

core/java/android/provider/ContactsContract.java

+3 −1
Original line number Diff line number Diff line
@@ -5957,7 +5957,9 @@ public final class ContactsContract { 
             */

            public static final CharSequence getTypeLabel(Resources res, int type,

                    CharSequence label) {

                if ((type == TYPE_CUSTOM || type == TYPE_ASSISTANT) && !TextUtils.isEmpty(label)) {

                if (type == TYPE_CUSTOM) {

                    return (label != null ? label : "");

                } else if (type == TYPE_ASSISTANT && !TextUtils.isEmpty(label)) {

                    return label;

                } else {

                    final int labelRes = getTypeLabelResource(type);