ChargingControl: Retry setting deadline if it fails

Do not save the target time unless setting deadline succeeds, effectively allowing it to be retried later. Change-Id: I572b935b088170d56623a33c5efd2292b1a67126 Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>
PixelOS-AOSP · Sep 28, 2023 · 2a76f59 · 2a76f59
1 parent 23abb13
commit 2a76f59
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/services/core/java/com/android/server/lineage/health/ChargingControlController.java b/services/core/java/com/android/server/lineage/health/ChargingControlController.java
@@ -578,22 +578,24 @@ private void updateChargeDeadline() {
         }
 
         long deadline = 0;
+        final long targetTime;
         final ChargeTime t = getChargeTime();
 
         if (!mConfigEnabled || t == null || mIsControlCancelledOnce) {
             deadline = -1;
+            targetTime = 0;
         } else {
             if (t.getTargetTime() == mSavedTargetTime) {
                 return;
             }
-            mSavedTargetTime = t.getTargetTime();
-            final long targetTime = t.getTargetTime();
+            targetTime = t.getTargetTime();
             final long currentTime = System.currentTimeMillis();
             deadline = (targetTime - currentTime) / 1000;
         }
 
         try {
             mChargingControl.setChargingDeadline(deadline);
+            mSavedTargetTime = targetTime;
         } catch (IllegalStateException | RemoteException | UnsupportedOperationException e) {
             Log.e(TAG, "Failed to set charge deadline");
         }