summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothGattServer.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/BluetoothGattServer.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/BluetoothGattServer.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothGattServer.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/framework/java/android/bluetooth/BluetoothGattServer.java b/framework/java/android/bluetooth/BluetoothGattServer.java
index 7b86a17283..4ed250043a 100644
--- a/framework/java/android/bluetooth/BluetoothGattServer.java
+++ b/framework/java/android/bluetooth/BluetoothGattServer.java
@@ -356,9 +356,9 @@ public final class BluetoothGattServer implements BluetoothProfile {
public void onConnectionUpdated(String address, int interval, int latency,
int timeout, int status) {
if (DBG) {
- Log.d(TAG, "onConnectionUpdated() - Device=" + address +
- " interval=" + interval + " latency=" + latency +
- " timeout=" + timeout + " status=" + status);
+ Log.d(TAG, "onConnectionUpdated() - Device=" + address
+ + " interval=" + interval + " latency=" + latency
+ + " timeout=" + timeout + " status=" + status);
}
BluetoothDevice device = mAdapter.getRemoteDevice(address);
if (device == null) return;
@@ -505,9 +505,9 @@ public final class BluetoothGattServer implements BluetoothProfile {
*/
/*package*/ BluetoothGattService getService(UUID uuid, int instanceId, int type) {
for (BluetoothGattService svc : mServices) {
- if (svc.getType() == type &&
- svc.getInstanceId() == instanceId &&
- svc.getUuid().equals(uuid)) {
+ if (svc.getType() == type
+ && svc.getInstanceId() == instanceId
+ && svc.getUuid().equals(uuid)) {
return svc;
}
}
@@ -543,8 +543,8 @@ public final class BluetoothGattServer implements BluetoothProfile {
if (mService == null || mServerIf == 0) return false;
try {
- mService.serverConnect(mServerIf, device.getAddress(),
- autoConnect ? false : true, mTransport); // autoConnect is inverse of "isDirect"
+ // autoConnect is inverse of "isDirect"
+ mService.serverConnect(mServerIf, device.getAddress(), !autoConnect, mTransport);
} catch (RemoteException e) {
Log.e(TAG, "", e);
return false;
@@ -822,8 +822,8 @@ public final class BluetoothGattServer implements BluetoothProfile {
*/
@Override
public List<BluetoothDevice> getConnectedDevices() {
- throw new UnsupportedOperationException
- ("Use BluetoothManager#getConnectedDevices instead.");
+ throw new UnsupportedOperationException(
+ "Use BluetoothManager#getConnectedDevices instead.");
}
/**
@@ -835,7 +835,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
*/
@Override
public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
- throw new UnsupportedOperationException
- ("Use BluetoothManager#getDevicesMatchingConnectionStates instead.");
+ throw new UnsupportedOperationException(
+ "Use BluetoothManager#getDevicesMatchingConnectionStates instead.");
}
}