From 7fbaf08b0abf03e8570690d1e615decaca8c02ce Mon Sep 17 00:00:00 2001 From: Michael W Date: Thu, 31 Aug 2023 18:23:58 +0330 Subject: [PATCH] ChargingControl: No need to log a crash when not supported Instead of relying on catching the exception later on, check if ChargingControl is actually supported before checking if a specific mode is Change-Id: Icaf8d333842c9847bea00bedb4b302b7acd49bb3 Signed-off-by: Mohammad Hasan Keramat J --- .../server/lineage/health/ChargingControlController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a3d99f33725..b584a289954d 100644 --- a/services/core/java/com/android/server/lineage/health/ChargingControlController.java +++ b/services/core/java/com/android/server/lineage/health/ChargingControlController.java @@ -254,7 +254,7 @@ public boolean reset() { public boolean isChargingModeSupported(int mode) { try { - return (mChargingControl.getSupportedMode() & mode) != 0; + return isSupported() && (mChargingControl.getSupportedMode() & mode) != 0; } catch (RemoteException e) { throw new RuntimeException(e); }