diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-24 21:25:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-24 21:25:49 +0000 |
| commit | 94bbd4256d7261aa1d8ddf660e7856cde5afa49f (patch) | |
| tree | 8299c300f3b4dbc2a5360c3319ac41bf1b389e55 /framework/java/android/bluetooth/le/AdvertiseData.java | |
| parent | 931010f176faa894f06051c57290f7723dfbcd49 (diff) | |
| parent | 9e045d26d0128826b40520f523307d8d16473779 (diff) | |
Merge changes from topic "bt-fix-checkstyle-errors"
* changes:
Fix checkstyle errors (2/2)
Fix checkstyle errors (1/2)
Diffstat (limited to 'framework/java/android/bluetooth/le/AdvertiseData.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/AdvertiseData.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/framework/java/android/bluetooth/le/AdvertiseData.java b/framework/java/android/bluetooth/le/AdvertiseData.java index bde2d2f890..b65c31d1dc 100644 --- a/framework/java/android/bluetooth/le/AdvertiseData.java +++ b/framework/java/android/bluetooth/le/AdvertiseData.java @@ -118,11 +118,12 @@ public final class AdvertiseData implements Parcelable { return false; } AdvertiseData other = (AdvertiseData) obj; - return Objects.equals(mServiceUuids, other.mServiceUuids) && - BluetoothLeUtils.equals(mManufacturerSpecificData, other.mManufacturerSpecificData) && - BluetoothLeUtils.equals(mServiceData, other.mServiceData) && - mIncludeDeviceName == other.mIncludeDeviceName && - mIncludeTxPowerLevel == other.mIncludeTxPowerLevel; + return Objects.equals(mServiceUuids, other.mServiceUuids) + && BluetoothLeUtils.equals(mManufacturerSpecificData, + other.mManufacturerSpecificData) + && BluetoothLeUtils.equals(mServiceData, other.mServiceData) + && mIncludeDeviceName == other.mIncludeDeviceName + && mIncludeTxPowerLevel == other.mIncludeTxPowerLevel; } @Override @@ -160,12 +161,12 @@ public final class AdvertiseData implements Parcelable { public static final Parcelable.Creator<AdvertiseData> CREATOR = new Creator<AdvertiseData>() { - @Override + @Override public AdvertiseData[] newArray(int size) { return new AdvertiseData[size]; } - @Override + @Override public AdvertiseData createFromParcel(Parcel in) { Builder builder = new Builder(); ArrayList<ParcelUuid> uuids = in.createTypedArrayList(ParcelUuid.CREATOR); @@ -222,7 +223,7 @@ public final class AdvertiseData implements Parcelable { * @param serviceDataUuid 16-bit UUID of the service the data is associated with * @param serviceData Service data * @throws IllegalArgumentException If the {@code serviceDataUuid} or {@code serviceData} is - * empty. + * empty. */ public Builder addServiceData(ParcelUuid serviceDataUuid, byte[] serviceData) { if (serviceDataUuid == null || serviceData == null) { @@ -242,8 +243,8 @@ public final class AdvertiseData implements Parcelable { * * @param manufacturerId Manufacturer ID assigned by Bluetooth SIG. * @param manufacturerSpecificData Manufacturer specific data - * @throws IllegalArgumentException If the {@code manufacturerId} is negative or - * {@code manufacturerSpecificData} is null. + * @throws IllegalArgumentException If the {@code manufacturerId} is negative or {@code + * manufacturerSpecificData} is null. */ public Builder addManufacturerData(int manufacturerId, byte[] manufacturerSpecificData) { if (manufacturerId < 0) { |