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

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

am 435d6efc: am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert... 

am 435d6efc: am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev

* commit '435d6efc':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
parents 02693521 435d6efc

core/java/android/provider/ContactsContract.java

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

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

                    CharSequence label) {

                if (type == TYPE_CUSTOM) {

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

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

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

                    return label;

                } else {

                    final int labelRes = getTypeLabelResource(type);