Punt battery status action when entering Settings main page

- Checking battery sharing states at the beging may have some performance issue, post battery status update to background thread to avoid ANR

Bug: 193600924
Test: make SettingsRoboTests
Change-Id: I3b73e6bd4f952bc832783b9b3b5d45db560d088c
This commit is contained in:
Wesley.CW Wang
2021-09-30 14:59:26 +08:00
parent d9db89af86
commit 0cd29a70a4
2 changed files with 19 additions and 4 deletions

View File

@@ -30,6 +30,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.utils.ThreadUtils;
import java.util.HashMap; import java.util.HashMap;
@@ -38,8 +39,9 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
@VisibleForTesting @VisibleForTesting
protected boolean mIsBatteryPresent = true; protected boolean mIsBatteryPresent = true;
@VisibleForTesting
Preference mPreference;
private final BatteryBroadcastReceiver mBatteryBroadcastReceiver; private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
private Preference mPreference;
private BatteryInfo mBatteryInfo; private BatteryInfo mBatteryInfo;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider; private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider; private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
@@ -140,14 +142,26 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
} }
if (batteryStatusUpdate) { if (batteryStatusUpdate) {
if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) { setSummaryAsync(info);
mBatteryStatusLabel = null; // will generateLabel()
}
} }
return (mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel; return (mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel;
} }
private void setSummaryAsync(BatteryInfo info) {
ThreadUtils.postOnBackgroundThread(() -> {
final boolean triggerBatteryStatusUpdate =
mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info);
ThreadUtils.postOnMainThread(() -> {
if (!triggerBatteryStatusUpdate) {
mBatteryStatusLabel = null; // will generateLabel()
}
mPreference.setSummary(
(mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel);
});
});
}
private CharSequence generateLabel(BatteryInfo info) { private CharSequence generateLabel(BatteryInfo info) {
if (!info.discharging && info.chargeLabel != null) { if (!info.discharging && info.chargeLabel != null) {
return info.chargeLabel; return info.chargeLabel;

View File

@@ -156,6 +156,7 @@ public class TopLevelBatteryPreferenceControllerTest {
@Test @Test
public void getDashboardLabel_returnsCorrectLabel() { public void getDashboardLabel_returnsCorrectLabel() {
mController.mPreference = new Preference(mContext);
BatteryInfo info = new BatteryInfo(); BatteryInfo info = new BatteryInfo();
info.batteryPercentString = "3%"; info.batteryPercentString = "3%";
assertThat(mController.getDashboardLabel(mContext, info, true)) assertThat(mController.getDashboardLabel(mContext, info, true))