commit b944c87e1666e3863e66b5ee617716d0016354a7
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 21 12:13:24 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 21 12:13:24 2014 -0700
tree 3b2d92e74014e15996272e52a389cc56bec09dc9
parent 58f2d10b0f37eae3a5916cd9fc45f83cde14ce83
parent 7d0bd03402813fa90b1141fda75375b3f500165a

Merge "FTP: Handle FTP registration on SSR."

hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidWrapperService.java

diff --git a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidWrapperService.java b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidWrapperService.java
index 718a580..5057605 100644
--- a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidWrapperService.java
+++ b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidWrapperService.java
@@ -86,6 +86,8 @@
 
     private float mBatteryLevel = 0;
 
+    private float mCurrentBatteryLevel = 0;
+
     private int mConnectionState = BluetoothHidDevice.STATE_DISCONNECTED;
 
     private MouseWrapper mMouseWrapper = new MouseWrapper();
@@ -274,6 +276,7 @@
                     mInputReportCache.clear();
                     mOutputReportCache.clear();
                     mBatteryWrapper.update(mBatteryLevel);
+                    mCurrentBatteryLevel = mBatteryLevel;
                     mEventListener.onProtocolModeState(
                         mProtocol == BluetoothHidDevice.PROTOCOL_BOOT_MODE);
                     break;
@@ -368,8 +371,11 @@
                 int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
 
                 mBatteryLevel = (float) level / (float) scale;
-
-                mBatteryWrapper.update(mBatteryLevel);
+                if (mCurrentBatteryLevel != mBatteryLevel) {
+                    Log.v(TAG, "ACTION_BATTERY_CHANGED, mBatteryLevel = " + mBatteryLevel);
+                    mBatteryWrapper.update(mBatteryLevel);
+                    mCurrentBatteryLevel = mBatteryLevel;
+                }
             }
         }
 
@@ -514,6 +520,7 @@
         private byte[] mBuffer = new byte[1];
 
         public synchronized void update(float level) {
+            Log.v(TAG, "BatteryWrapper: update: level = " + level);
             if (mConnectionState != BluetoothHidDevice.STATE_CONNECTED) {
                 // battery update will not trigger reconnection
                 return;
@@ -524,8 +531,10 @@
                 return;
 
             int val = (int) (level * 255);
+            Log.v(TAG, "BatteryWrapper: update: val = " + val);
 
             mBuffer[0] = (byte) (val & 0xff);
+            Log.v(TAG, "BatteryWrapper: update: mBuffer[0] = " + mBuffer[0]);
 
             if (mHidDevice != null) {
                 storeReport(HidConsts.BATTERY_REPORT_ID, mBuffer, true);