From fff124f72a20a7a3c948fb3dca57fe06da949350 Mon Sep 17 00:00:00 2001 From: Luofan Chen Date: Thu, 31 Aug 2023 18:36:16 +0330 Subject: [PATCH] ChargingControl: Return early if lineage health HAL is not found Change-Id: I2616224167a4fe5e59bdf01c5e124744bb8b2d51 Signed-off-by: Mohammad Hasan Keramat J --- .../health/ChargingControlController.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 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 index af558fc286a7..a3405361f854 100644 --- a/services/core/java/com/android/server/lineage/health/ChargingControlController.java +++ b/services/core/java/com/android/server/lineage/health/ChargingControlController.java @@ -64,15 +64,15 @@ public class ChargingControlController extends LineageHealthFeature { private final IChargingControl mChargingControl; private final ContentResolver mContentResolver; - private final ChargingControlNotification mChargingNotification; + private ChargingControlNotification mChargingNotification = null; private LineageHealthBatteryBroadcastReceiver mBattReceiver; // Defaults - private final boolean mDefaultEnabled; - private final int mDefaultMode; - private final int mDefaultLimit; - private final int mDefaultStartTime; - private final int mDefaultTargetTime; + private boolean mDefaultEnabled = false; + private int mDefaultMode = 0; + private int mDefaultLimit = 0; + private int mDefaultStartTime = 0; + private int mDefaultTargetTime = 0; // User configs private boolean mConfigEnabled = false; @@ -101,11 +101,11 @@ public class ChargingControlController extends LineageHealthFeature { private long mSavedAlarmTime = 0; private long mSavedTargetTime = 0; private boolean mIsControlCancelledOnce = false; - private final boolean mIsChargingToggleSupported; - private final boolean mIsChargingBypassSupported; - private final boolean mIsChargingDeadlineSupported; - private final int mChargingTimeMargin; - private final int mChargingLimitMargin; + private boolean mIsChargingToggleSupported = false; + private boolean mIsChargingBypassSupported = false; + private boolean mIsChargingDeadlineSupported = false; + private int mChargingTimeMargin = 0; + private int mChargingLimitMargin = 0; private static final DateTimeFormatter mFormatter = DateTimeFormatter.ofLocalizedTime(SHORT); private static final SimpleDateFormat mDateFormatter = new SimpleDateFormat("hh:mm:ss a"); @@ -147,6 +147,7 @@ public ChargingControlController(Context context, Handler handler) { if (mChargingControl == null) { Log.i(TAG, "Lineage Health HAL not found"); + return; } mChargingNotification = new ChargingControlNotification(context);