ChargingControl: Return early if lineage health HAL is not found
Change-Id: I2616224167a4fe5e59bdf01c5e124744bb8b2d51
diff --git a/src/org/omnirom/omnilib/internal/health/ChargingControlController.java b/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
index 71e4a05..ec7558d 100644
--- a/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
+++ b/src/org/omnirom/omnilib/internal/health/ChargingControlController.java
@@ -65,15 +65,15 @@
public class ChargingControlController extends OmniRomHealthFeature {
private final IChargingControl mChargingControl;
private final ContentResolver mContentResolver;
- private final ChargingControlNotification mChargingNotification;
+ private ChargingControlNotification mChargingNotification = null;
private OmniRomHealthBatteryBroadcastReceiver 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;
@@ -102,11 +102,11 @@
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");
@@ -148,6 +148,7 @@
if (mChargingControl == null) {
Log.i(TAG, "OmniRom Health HAL not found");
+ return;
}
mChargingNotification = new ChargingControlNotification(context);