bluetooth: android: Code cleanup fixing comments, typos, simplified names.

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java

Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
index 3b64681614b8ccc2198da9ef4f92a4778f710371..b02d0799277b4904d056eb9e23d305c1b4c2e4e7 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
@@ -21,18 +21,18 @@ final class ChromeBluetoothRemoteGattCharacteristic {
 
     private long mNativeBluetoothRemoteGattCharacteristicAndroid;
     final Wrappers.BluetoothGattCharacteristicWrapper mCharacteristic;

[Jeffrey Yasskin, 2016/01/12 17:00:30]

I wonder if we should be calling this "mAndroidCharacteristic", to be explicit
on both sides rather than just the Chrome side. No need to change it unless you
think it's a good idea.

[scheib, 2016/01/12 17:54:36]

I've considered, but think I'll keep the shorter names:
Want clarity - but balanced with being succinct.
At this layer the mCharacteristic represents the most 'native' concept
of characteristic available to this code. Other objects that aren't as 'native'
but are peer or otherwise known high level objects are decorated with clarifying
names.

-    final ChromeBluetoothDevice mChromeBluetoothDevice;
+    final ChromeBluetoothDevice mChromeDevice;
 
     private ChromeBluetoothRemoteGattCharacteristic(
             long nativeBluetoothRemoteGattCharacteristicAndroid,
             Wrappers.BluetoothGattCharacteristicWrapper characteristicWrapper,
-            ChromeBluetoothDevice chromeBluetoothDevice) {
+            ChromeBluetoothDevice chromeDevice) {
         mNativeBluetoothRemoteGattCharacteristicAndroid =
                 nativeBluetoothRemoteGattCharacteristicAndroid;
         mCharacteristic = characteristicWrapper;
-        mChromeBluetoothDevice = chromeBluetoothDevice;
+        mChromeDevice = chromeDevice;
 
-        mChromeBluetoothDevice.mWrapperToChromeCharacteristicsMap.put(characteristicWrapper, this);
+        mChromeDevice.mWrapperToChromeCharacteristicsMap.put(characteristicWrapper, this);
 
         Log.v(TAG, "ChromeBluetoothRemoteGattCharacteristic created.");
     }
@@ -44,7 +44,7 @@ final class ChromeBluetoothRemoteGattCharacteristic {
     private void onBluetoothRemoteGattCharacteristicAndroidDestruction() {
         Log.v(TAG, "ChromeBluetoothRemoteGattCharacteristic Destroyed.");
         mNativeBluetoothRemoteGattCharacteristicAndroid = 0;
-        mChromeBluetoothDevice.mWrapperToChromeCharacteristicsMap.remove(mCharacteristic);
+        mChromeDevice.mWrapperToChromeCharacteristicsMap.remove(mCharacteristic);
     }
 
     void onCharacteristicRead(int status) {
@@ -72,11 +72,11 @@ final class ChromeBluetoothRemoteGattCharacteristic {
     @CalledByNative
     private static ChromeBluetoothRemoteGattCharacteristic create(
             long nativeBluetoothRemoteGattCharacteristicAndroid,
-            Object bluetoothGattCarachteristicWrapper, Object chromeBluetoothDevice) {
+            Object bluetoothGattCarachteristicWrapper, Object chromeDevice) {
         return new ChromeBluetoothRemoteGattCharacteristic(
                 nativeBluetoothRemoteGattCharacteristicAndroid,
                 (Wrappers.BluetoothGattCharacteristicWrapper) bluetoothGattCarachteristicWrapper,
-                (ChromeBluetoothDevice) chromeBluetoothDevice);
+                (ChromeBluetoothDevice) chromeDevice);
     }
 
     // Implements BluetoothRemoteGattCharacteristicAndroid::GetUUID.
@@ -95,8 +95,7 @@ final class ChromeBluetoothRemoteGattCharacteristic {
     // Implements BluetoothRemoteGattCharacteristicAndroid::StartNotifySession.
     @CalledByNative
     private boolean startNotifySession() {
-        if (!mChromeBluetoothDevice.mBluetoothGatt.setCharacteristicNotification(
-                    mCharacteristic, true)) {
+        if (!mChromeDevice.mBluetoothGatt.setCharacteristicNotification(mCharacteristic, true)) {
             Log.i(TAG, "startNotifySession setCharacteristicNotification failed.");
             return false;
         }
@@ -107,7 +106,7 @@ final class ChromeBluetoothRemoteGattCharacteristic {
     // Implements BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristic.
     @CalledByNative
     private boolean readRemoteCharacteristic() {
-        if (!mChromeBluetoothDevice.mBluetoothGatt.readCharacteristic(mCharacteristic)) {
+        if (!mChromeDevice.mBluetoothGatt.readCharacteristic(mCharacteristic)) {
             Log.i(TAG, "readRemoteCharacteristic readCharacteristic failed.");
             return false;
         }
@@ -121,7 +120,7 @@ final class ChromeBluetoothRemoteGattCharacteristic {
             Log.i(TAG, "writeRemoteCharacteristic setValue failed.");
             return false;
         }
-        if (!mChromeBluetoothDevice.mBluetoothGatt.writeCharacteristic(mCharacteristic)) {
+        if (!mChromeDevice.mBluetoothGatt.writeCharacteristic(mCharacteristic)) {
             Log.i(TAG, "writeRemoteCharacteristic writeCharacteristic failed.");
             return false;
         }
@@ -131,10 +130,10 @@ final class ChromeBluetoothRemoteGattCharacteristic {
     // ---------------------------------------------------------------------------------------------
     // BluetoothAdapterDevice C++ methods declared for access from java:
 
-    // Binds to BluetoothRemoteGattServiceAndroid::OnRead.
+    // Binds to BluetoothRemoteGattCharacteristicAndroid::OnRead.
     native void nativeOnRead(
             long nativeBluetoothRemoteGattCharacteristicAndroid, int status, byte[] value);
 
-    // Binds to BluetoothRemoteGattServiceAndroid::OnWrite.
+    // Binds to BluetoothRemoteGattCharacteristicAndroid::OnWrite.
     native void nativeOnWrite(long nativeBluetoothRemoteGattCharacteristicAndroid, int status);
 }