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

Commit fe8176bd authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE if someone creates a bad BluetoothHealthAppConfig object" into nyc-mr1-dev

parents 1d8390ab 74fa2d68

core/java/android/bluetooth/BluetoothHealthAppConfiguration.java

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ public final class BluetoothHealthAppConfiguration implements Parcelable { 
    public boolean equals(Object o) {

        if (o instanceof BluetoothHealthAppConfiguration) {

            BluetoothHealthAppConfiguration config = (BluetoothHealthAppConfiguration) o;

            // config.getName() can never be NULL



            if (mName == null) return false;



            return mName.equals(config.getName()) &&

                    mDataType == config.getDataType() &&

                    mRole == config.getRole() &&