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

Commit 17474f47 authored by Tingting Wang's avatar Tingting Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix bug on edit email type for exchange contacts." into ub-contactsdialer-b-dev

parents 0c14d011 10acf194

src/com/android/contacts/common/model/RawContactModifier.java

+3 −3
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ public class RawContactModifier { 


        // Build list of valid types

        final int overallCount = typeCount.get(FREQUENCY_TOTAL);

        for (EditType type : kind.typeList) {

        final boolean validOverall = (kind.typeOverallMax == -1 ? true

                    : overallCount < kind.typeOverallMax);

                : overallCount <= kind.typeOverallMax);

        for (EditType type : kind.typeList) {

            final boolean validSpecific = (type.specificMax == -1 ? true : typeCount

                    .get(type.rawValue) < type.specificMax);

                    .get(type.rawValue) <= type.specificMax);

            final boolean validSecondary = (includeSecondary ? true : !type.secondary);

            final boolean forcedInclude = type.equals(forceInclude);

            if (forcedInclude || (validOverall && validSpecific && validSecondary)) {