ChargingControl: Don't set deadline if charging control is not enabled
Change-Id: I5e7570184294e8391e4908e449c1bffb07d9410d
diff --git a/src/org/omnirom/omnilib/internal/health/ChargingControlController.java b/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
index 3738be8..1e92542 100644
--- a/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
+++ b/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
@@ -576,15 +576,15 @@
return;
}
- final ChargeTime t = getChargeTime();
- if (t != null && t.getTargetTime() == mSavedTargetTime) {
- return;
- }
-
long deadline = 0;
- if (t == null || mIsControlCancelledOnce) {
+ final ChargeTime t = getChargeTime();
+
+ if (!mConfigEnabled || t == null || mIsControlCancelledOnce) {
deadline = -1;
} else {
+ if (t.getTargetTime() == mSavedTargetTime) {
+ return;
+ }
mSavedTargetTime = t.getTargetTime();
final long targetTime = t.getTargetTime();
final long currentTime = System.currentTimeMillis();