From a500e4f7393c7d36373e76f1b78618391f7d4d62 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Wed, 11 Jan 2023 16:30:29 +0800 Subject: [PATCH] Clean up always false parameter isValidToShowSummary. So the next cl (new summary for battery detail page) doesn't need to deal with isValidToShowSummary=true case. Bug: 262802531 Test: presubmit Change-Id: I88528caedb29d61a05b40d3ca435fc007bf3f54c --- .../AppBatteryPreferenceController.java | 4 +- .../fuelgauge/AdvancedPowerUsageDetail.java | 5 +- .../AdvancedPowerUsageDetailTest.java | 63 +------------------ 3 files changed, 4 insertions(+), 68 deletions(-) diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 3e1a951d72f..2834983bdf7 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -140,8 +140,8 @@ public class AppBatteryPreferenceController extends BasePreferenceController + " | uid : " + entry.getUid() + " with BatteryEntry data"); - AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent, entry, - Utils.formatPercentage(0), /*isValidToShowSummary=*/ false); + AdvancedPowerUsageDetail.startBatteryDetailPage( + mParent.getActivity(), mParent, entry, Utils.formatPercentage(0)); } else { Log.i(TAG, "Launch : " + mPackageName + " with package name"); AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent, diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index a05a42d7b6a..e0913009ce8 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -162,8 +162,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements /** Launches battery details page for an individual battery consumer. */ public static void startBatteryDetailPage(Activity caller, - InstrumentedPreferenceFragment fragment, BatteryEntry entry, String usagePercent, - boolean isValidToShowSummary) { + InstrumentedPreferenceFragment fragment, BatteryEntry entry, String usagePercent) { final LaunchBatteryDetailPageArgs launchArgs = new LaunchBatteryDetailPageArgs(); // configure the launch argument. launchArgs.mUsagePercent = usagePercent; @@ -172,8 +171,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements launchArgs.mUid = entry.getUid(); launchArgs.mIconId = entry.mIconId; launchArgs.mConsumedPower = (int) entry.getConsumedPower(); - launchArgs.mForegroundTimeMs = isValidToShowSummary ? entry.getTimeInForegroundMs() : 0; - launchArgs.mBackgroundTimeMs = isValidToShowSummary ? entry.getTimeInBackgroundMs() : 0; launchArgs.mIsUserEntry = entry.isUserEntry(); startBatteryDetailPage(caller, fragment.getMetricsCategory(), launchArgs); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 683313a1c7a..d39ba481a38 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -23,7 +23,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -493,24 +492,10 @@ public class AdvancedPowerUsageDetailTest { assertThat(captor.getValue()).isNotNull(); } - @Test - public void startBatteryDetailPage_hasBasicData() { - AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); - - assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID); - assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)) - .isEqualTo(BACKGROUND_TIME_MS); - assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)) - .isEqualTo(FOREGROUND_TIME_MS); - assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)) - .isEqualTo(USAGE_PERCENT); - } - @Test public void startBatteryDetailPage_invalidToShowSummary_noFGBDData() { AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ false); + mBatteryEntry, USAGE_PERCENT); assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID); assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)) @@ -521,52 +506,6 @@ public class AdvancedPowerUsageDetailTest { .isEqualTo(USAGE_PERCENT); } - @Test - public void startBatteryDetailPage_NormalApp() { - when(mBatteryEntry.getDefaultPackageName()).thenReturn(PACKAGE_NAME[0]); - - AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); - - assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo( - PACKAGE_NAME[0]); - } - - @Test - public void startBatteryDetailPage_SystemApp() { - when(mBatteryEntry.getDefaultPackageName()).thenReturn(null); - - AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); - - assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL); - assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID); - assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isNull(); - } - - @Test - public void startBatteryDetailPage_WorkApp() { - final int appUid = 1010019; - doReturn(appUid).when(mBatteryEntry).getUid(); - - AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); - - verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(10))); - } - - @Test - public void startBatteryDetailPage_typeUser_startByCurrentUser() { - when(mBatteryEntry.isUserEntry()).thenReturn(true); - - final int currentUser = 20; - ShadowActivityManager.setCurrentUser(currentUser); - AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, - mBatteryEntry, USAGE_PERCENT, /*isValidToShowSummary=*/ true); - - verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(currentUser))); - } - @Test public void startBatteryDetailPage_noBatteryUsage_hasBasicData() { final ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class);