diff options
| author | bait_dispatcher_monitor_system <bait_dispatcher_monitor_system@localhost> | 2015-02-19 22:48:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-19 22:48:03 -0800 |
| commit | 37e8129f7fa0416f3c5e6ca02db73f5ad873fb15 (patch) | |
| tree | 099258e4b73bde5fcddce2c815f03774fa2acacf | |
| parent | 7e0bc265b2f669726ac9e0feebf98c18809e0818 (diff) | |
| parent | a4eb31a8767525934e4e302ef707052a9961f0bd (diff) | |
| download | android_packages_apps_BluetoothExt-37e8129f7fa0416f3c5e6ca02db73f5ad873fb15.tar.gz android_packages_apps_BluetoothExt-37e8129f7fa0416f3c5e6ca02db73f5ad873fb15.tar.bz2 android_packages_apps_BluetoothExt-37e8129f7fa0416f3c5e6ca02db73f5ad873fb15.zip | |
Merge "Bluetooth-Wipower:Fix for re-connect and Vrect_max value change."
| -rw-r--r-- | src/org/codeaurora/bluetooth/a4wp/A4wpService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java index 527e58c..ebd4cc4 100644 --- a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java +++ b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java @@ -113,7 +113,7 @@ public class A4wpService extends Service private final static byte DEFAULT_FW_VERSION = 0x0006; private final static byte DEFAULT_MAX_POWER_DESIRED = 0x0032; // 5Watts private final static short DEFAULT_VRECT_MIN = 7000; // 7 Volts - private final static short DEFAULT_VRECT_MAX = 18000; // 18 Volts + private final static short DEFAULT_VRECT_MAX = 19300; // 19.3 Volts private final static short DEFAULT_VRECT_SET = 7200; // 7.2 Volts private final static short DEFAULT_DELTA_R1 = 0x0001; private final static int DEFAULT_RFU_VAL = 0x0000; @@ -626,6 +626,11 @@ public class A4wpService extends Service if (mBluetoothGattServer != null && mDevice != null) { Log.v(LOGTAG, "onPowerApply " + state + "dropping Connection"); mBluetoothGattServer.cancelConnection(mDevice); + if (mChargeComplete == true) { + mWipowerManager.enablePowerApply(true, true, true); + } else { + mWipowerManager.enablePowerApply(true, true, false); + } } else { Log.v(LOGTAG, "onPowerApply " + state + "skip dropping Connection"); } |