PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove legacy useless BatteryTip cache mechanism

Browse Source 
Remove the legacy BatteryTip list cache mechanism to avoid not using the
new re-create BatteryTip list, but only update its state and invoke
updatePreference(). We should use the new BatteryTip list to apply the
new detected results.

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: I884f04927403ad4d97b459ff5477a1fe9df21553
This commit is contained in:
ykhung
2023-02-09 01:11:25 +08:00
parent 19b913cd0c
commit 4a1f04e70d
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
View File

@@ -36,6 +36,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
/** /**
* Controller in charge of the battery tip group * Controller in charge of the battery tip group
@@ -98,15 +99,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
if (batteryTips == null) { if (batteryTips == null) {
return; return;
} }
if (mBatteryTips == null) { mBatteryTips = batteryTips;
mBatteryTips = batteryTips;
} else {
// mBatteryTips and batteryTips always have the same length and same sequence.
for (int i = 0, size = batteryTips.size(); i < size; i++) {
mBatteryTips.get(i).updateState(batteryTips.get(i));
}
}
mCardPreference.setVisible(false); mCardPreference.setVisible(false);
for (int i = 0, size = batteryTips.size(); i < size; i++) { for (int i = 0, size = batteryTips.size(); i < size; i++) {
final BatteryTip batteryTip = mBatteryTips.get(i); final BatteryTip batteryTip = mBatteryTips.get(i);
@@ -171,9 +164,9 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
if (mBatteryTips == null) { if (mBatteryTips == null) {
return null; return null;
} }
Optional<BatteryTip> visibleBatteryTip =
return mBatteryTips.stream().anyMatch(BatteryTip::isVisible) mBatteryTips.stream().filter(BatteryTip::isVisible).findFirst();
? mBatteryTips.stream().filter(BatteryTip::isVisible).findFirst().get() : null; return visibleBatteryTip.orElse(null);
} }
/** /**