Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pankaj Kanwar
2016-09-26 18:24:35 +00:00
committed by Android (Google) Code Review
parent 1d8390ab68 74fa2d6846
commit fe8176bda7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothHealthAppConfiguration.java
View File

@@ -68,7 +68,9 @@ public final class BluetoothHealthAppConfiguration implements Parcelable {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof BluetoothHealthAppConfiguration) { if (o instanceof BluetoothHealthAppConfiguration) {
BluetoothHealthAppConfiguration config = (BluetoothHealthAppConfiguration) o; BluetoothHealthAppConfiguration config = (BluetoothHealthAppConfiguration) o;
// config.getName() can never be NULL
if (mName == null) return false;
return mName.equals(config.getName()) && return mName.equals(config.getName()) &&
mDataType == config.getDataType() && mDataType == config.getDataType() &&
mRole == config.getRole() && mRole == config.getRole() &&