summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothAudioConfig.java
diff options
context:
space:
mode:
authorJack He <siyuanh@google.com>2017-08-22 21:21:23 -0700
committerJack He <siyuanh@google.com>2017-08-24 19:09:58 +0000
commit9e045d26d0128826b40520f523307d8d16473779 (patch)
tree8299c300f3b4dbc2a5360c3319ac41bf1b389e55 /framework/java/android/bluetooth/BluetoothAudioConfig.java
parent910201beb0bde1dcf6b33e4ec5d1eb60042419d8 (diff)
Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance * Variable name refactors are done through IDE * Corrected general style errors such as: - "final private var" -> "private final var" - "&&", "+", "||" should not be at the end of line - Non-static private variable should be like "mVar" - Private static variable should be like "sVar" - Code file should always end with newline - Inherited methods should be annotated with @Override and no @hide tags - Public methods should always have a JavaDoc entry - "int[] array" is preferred over "int array[]" - private methods should be accessed without "this." when there is no name collisions. - "boolean ? true : false" -> boolean - "boolean ? false : true" -> !boolean - "boolean == true" OR "boolean != false" -> boolean - "boolean != true" OR "boolean == false" -> !boolean Bug: 63596319 Test: make checkbuild, no functional changes Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAudioConfig.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothAudioConfig.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAudioConfig.java b/framework/java/android/bluetooth/BluetoothAudioConfig.java
index 238bf842b7..a4410563c9 100644
--- a/framework/java/android/bluetooth/BluetoothAudioConfig.java
+++ b/framework/java/android/bluetooth/BluetoothAudioConfig.java
@@ -42,9 +42,8 @@ public final class BluetoothAudioConfig implements Parcelable {
public boolean equals(Object o) {
if (o instanceof BluetoothAudioConfig) {
BluetoothAudioConfig bac = (BluetoothAudioConfig) o;
- return (bac.mSampleRate == mSampleRate &&
- bac.mChannelConfig == mChannelConfig &&
- bac.mAudioFormat == mAudioFormat);
+ return (bac.mSampleRate == mSampleRate && bac.mChannelConfig == mChannelConfig
+ && bac.mAudioFormat == mAudioFormat);
}
return false;
}
@@ -60,6 +59,7 @@ public final class BluetoothAudioConfig implements Parcelable {
+ ",mAudioFormat:" + mAudioFormat + "}";
}
+ @Override
public int describeContents() {
return 0;
}
@@ -78,6 +78,7 @@ public final class BluetoothAudioConfig implements Parcelable {
}
};
+ @Override
public void writeToParcel(Parcel out, int flags) {
out.writeInt(mSampleRate);
out.writeInt(mChannelConfig);