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

Commit 638274a8 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix NPE caused by Id96aea69 

I added an explicit null check for account type, but null was actually used for
the fallback account type.

Bug 5171336

Change-Id: Ia0b98d0e9451eb3fc33d52db09feaff390875e33
parent 8feafa54

src/com/android/contacts/model/AccountTypeWithDataSet.java

+4 −5
Original line number Diff line number Diff line
@@ -25,16 +25,14 @@ import android.text.TextUtils; 
 * Encapsulates an "account type" string and a "data set" string.

 */

public class AccountTypeWithDataSet {

    /** account type will never be null. */

    /** account type.  Can be null for fallback type. */

    public final String accountType;



    /** dataSet may be null, but never be "". */

    public final String dataSet;



    private AccountTypeWithDataSet(String accountType, String dataSet) {

        if (accountType == null) throw new NullPointerException();



        this.accountType = accountType;

        this.accountType = TextUtils.isEmpty(accountType) ? null : accountType;

        this.dataSet = TextUtils.isEmpty(dataSet) ? null : dataSet;

    }
@@ -53,7 +51,8 @@ public class AccountTypeWithDataSet { 


    @Override

    public int hashCode() {

        return Objects.hashCode(accountType) ^ (dataSet == null ? 0 : Objects.hashCode(dataSet));

        return (accountType == null ? 0 : accountType.hashCode())

                ^ (dataSet == null ? 0 : dataSet.hashCode());

    }



    @Override