Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037

Change-Id: I892a3d7cac9a4fe2fef8b50fcfea120ea62ae519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-13 05:21:35 +00:00
committed by Automerger Merge Worker

View File

@@ -296,6 +296,10 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
});
mHourlyChartView = hourlyChartView;
mHourlyChartView.setOnSelectListener(trapezoidIndex -> {
if (mDailyChartIndex == BatteryChartViewModel.SELECTED_INDEX_ALL) {
// This will happen when a daily slot and an hour slot are clicked together.
return;
}
if (mHourlyChartIndex == trapezoidIndex) {
return;
}