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

Merge "Fix crash in Monkey test." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-05 17:46:21 +00:00
committed by Android (Google) Code Review
parent 1b899f2a0a fd62af5792
commit d95668db99
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,9 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
} }
public void updateBatteryTips(List<BatteryTip> batteryTips) { public void updateBatteryTips(List<BatteryTip> batteryTips) {
if (batteryTips == null) {
return;
}
if (mBatteryTips == null) { if (mBatteryTips == null) {
mBatteryTips = batteryTips; mBatteryTips = batteryTips;
} else { } else {
@@ -100,7 +103,6 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
} }
} }
//TODO(b/70570352): try to reuse the existing preference rather than remove and add.
mPreferenceGroup.removeAll(); mPreferenceGroup.removeAll();
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);

13
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
View File

@@ -149,6 +149,19 @@ public class BatteryTipPreferenceControllerTest {
assertOnlyContainsSummaryTip(mPreferenceGroup); assertOnlyContainsSummaryTip(mPreferenceGroup);
} }
@Test
public void testRestoreFromNull_shouldNotCrash() {
final Bundle bundle = new Bundle();
// Battery tip list is null at this time
mBatteryTipPreferenceController.saveInstanceState(bundle);
final BatteryTipPreferenceController controller = new BatteryTipPreferenceController(
mContext, KEY_PREF, mSettingsActivity, mFragment, mBatteryTipListener);
// Should not crash
controller.restoreInstanceState(bundle);
}
@Test @Test
public void testHandlePreferenceTreeClick_noDialog_invokeCallback() { public void testHandlePreferenceTreeClick_noDialog_invokeCallback() {
when(mBatteryTip.getType()).thenReturn(SMART_BATTERY_MANAGER); when(mBatteryTip.getType()).thenReturn(SMART_BATTERY_MANAGER);