Update action log metircs of app optimize mode.
Bug: 317329360 Test: manual Change-Id: Id4cd610a5bcc7988ecbd4545f5ef77a5253aac33
This commit is contained in:
@@ -489,9 +489,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
|
|||||||
FeatureFactory.getFeatureFactory()
|
FeatureFactory.getFeatureFactory()
|
||||||
.getMetricsFeatureProvider()
|
.getMetricsFeatureProvider()
|
||||||
.action(
|
.action(
|
||||||
/* attribution */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
/* attribution */ SettingsEnums.LEAVE_APP_BATTERY_USAGE,
|
||||||
/* action */ finalMetricCategory,
|
/* action */ finalMetricCategory,
|
||||||
/* pageId */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
/* pageId */ SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL,
|
||||||
packageName,
|
packageName,
|
||||||
getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
|
getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
|
||||||
});
|
});
|
||||||
|
@@ -119,7 +119,7 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
|
|||||||
.getMetricsFeatureProvider()
|
.getMetricsFeatureProvider()
|
||||||
.action(
|
.action(
|
||||||
getContext(),
|
getContext(),
|
||||||
SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
SettingsEnums.OPEN_POWER_USAGE_MANAGE_BACKGROUND,
|
||||||
packageName);
|
packageName);
|
||||||
});
|
});
|
||||||
mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
|
mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
|
||||||
@@ -338,9 +338,11 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
|
|||||||
FeatureFactory.getFeatureFactory()
|
FeatureFactory.getFeatureFactory()
|
||||||
.getMetricsFeatureProvider()
|
.getMetricsFeatureProvider()
|
||||||
.action(
|
.action(
|
||||||
/* attribution */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
/* attribution */ SettingsEnums
|
||||||
|
.LEAVE_POWER_USAGE_MANAGE_BACKGROUND,
|
||||||
/* action */ finalMetricCategory,
|
/* action */ finalMetricCategory,
|
||||||
/* pageId */ SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
/* pageId */ SettingsEnums
|
||||||
|
.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND,
|
||||||
packageName,
|
packageName,
|
||||||
getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
|
getArguments().getInt(EXTRA_POWER_USAGE_AMOUNT));
|
||||||
});
|
});
|
||||||
|
@@ -413,9 +413,9 @@ public class AdvancedPowerUsageDetailTest {
|
|||||||
TimeUnit.SECONDS.sleep(1);
|
TimeUnit.SECONDS.sleep(1);
|
||||||
verify(mMetricsFeatureProvider)
|
verify(mMetricsFeatureProvider)
|
||||||
.action(
|
.action(
|
||||||
SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
SettingsEnums.LEAVE_APP_BATTERY_USAGE,
|
||||||
SettingsEnums.ACTION_APP_BATTERY_USAGE_ALLOW_BACKGROUND,
|
SettingsEnums.ACTION_APP_BATTERY_USAGE_ALLOW_BACKGROUND,
|
||||||
SettingsEnums.OPEN_APP_BATTERY_USAGE,
|
SettingsEnums.FUELGAUGE_POWER_USAGE_DETAIL,
|
||||||
packageName,
|
packageName,
|
||||||
/* consumed battery */ 0);
|
/* consumed battery */ 0);
|
||||||
}
|
}
|
||||||
|
@@ -22,19 +22,23 @@ import static com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.A
|
|||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.ArgumentMatchers.nullable;
|
import static org.mockito.ArgumentMatchers.nullable;
|
||||||
import static org.mockito.Mockito.doAnswer;
|
import static org.mockito.Mockito.doAnswer;
|
||||||
import static org.mockito.Mockito.doReturn;
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.verifyNoInteractions;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import android.app.AppOpsManager;
|
import android.app.AppOpsManager;
|
||||||
import android.app.backup.BackupManager;
|
import android.app.backup.BackupManager;
|
||||||
|
import android.app.settings.SettingsEnums;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
||||||
|
import android.content.pm.InstallSourceInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -46,12 +50,14 @@ import androidx.loader.app.LoaderManager;
|
|||||||
|
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
|
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
import com.android.settings.testutils.shadow.ShadowActivityManager;
|
import com.android.settings.testutils.shadow.ShadowActivityManager;
|
||||||
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
|
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
|
||||||
import com.android.settings.widget.EntityHeaderController;
|
import com.android.settings.widget.EntityHeaderController;
|
||||||
import com.android.settingslib.applications.AppUtils;
|
import com.android.settingslib.applications.AppUtils;
|
||||||
import com.android.settingslib.applications.ApplicationsState;
|
import com.android.settingslib.applications.ApplicationsState;
|
||||||
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
|
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
|
||||||
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
import com.android.settingslib.widget.FooterPreference;
|
import com.android.settingslib.widget.FooterPreference;
|
||||||
import com.android.settingslib.widget.LayoutPreference;
|
import com.android.settingslib.widget.LayoutPreference;
|
||||||
import com.android.settingslib.widget.MainSwitchPreference;
|
import com.android.settingslib.widget.MainSwitchPreference;
|
||||||
@@ -71,6 +77,8 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
import org.robolectric.annotation.Config;
|
import org.robolectric.annotation.Config;
|
||||||
import org.robolectric.util.ReflectionHelpers;
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(
|
@Config(
|
||||||
shadows = {
|
shadows = {
|
||||||
@@ -91,6 +99,7 @@ public class PowerBackgroundUsageDetailTest {
|
|||||||
private PowerBackgroundUsageDetail mFragment;
|
private PowerBackgroundUsageDetail mFragment;
|
||||||
private FooterPreference mFooterPreference;
|
private FooterPreference mFooterPreference;
|
||||||
private MainSwitchPreference mMainSwitchPreference;
|
private MainSwitchPreference mMainSwitchPreference;
|
||||||
|
private MetricsFeatureProvider mMetricsFeatureProvider;
|
||||||
private SelectorWithWidgetPreference mOptimizePreference;
|
private SelectorWithWidgetPreference mOptimizePreference;
|
||||||
private SelectorWithWidgetPreference mUnrestrictedPreference;
|
private SelectorWithWidgetPreference mUnrestrictedPreference;
|
||||||
private SettingsActivity mTestActivity;
|
private SettingsActivity mTestActivity;
|
||||||
@@ -110,15 +119,22 @@ public class PowerBackgroundUsageDetailTest {
|
|||||||
@Mock private PackageManager mPackageManager;
|
@Mock private PackageManager mPackageManager;
|
||||||
@Mock private AppOpsManager mAppOpsManager;
|
@Mock private AppOpsManager mAppOpsManager;
|
||||||
@Mock private CompoundButton mMockSwitch;
|
@Mock private CompoundButton mMockSwitch;
|
||||||
|
@Mock private InstallSourceInfo mInstallSourceInfo;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() throws Exception {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
mContext = spy(RuntimeEnvironment.application);
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
when(mContext.getPackageName()).thenReturn("foo");
|
when(mContext.getPackageName()).thenReturn("foo");
|
||||||
|
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||||
|
when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);
|
||||||
|
|
||||||
|
final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||||
|
mMetricsFeatureProvider = fakeFeatureFactory.metricsFeatureProvider;
|
||||||
|
|
||||||
mFragment = spy(new PowerBackgroundUsageDetail());
|
mFragment = spy(new PowerBackgroundUsageDetail());
|
||||||
|
mFragment.mLogStringBuilder = new StringBuilder();
|
||||||
doReturn(mContext).when(mFragment).getContext();
|
doReturn(mContext).when(mFragment).getContext();
|
||||||
doReturn(mActivity).when(mFragment).getActivity();
|
doReturn(mActivity).when(mFragment).getActivity();
|
||||||
doReturn(SUMMARY).when(mFragment).getString(anyInt());
|
doReturn(SUMMARY).when(mFragment).getString(anyInt());
|
||||||
@@ -285,4 +301,49 @@ public class PowerBackgroundUsageDetailTest {
|
|||||||
assertThat(mFragment.getSelectedPreference()).isEqualTo(optimizedMode);
|
assertThat(mFragment.getSelectedPreference()).isEqualTo(optimizedMode);
|
||||||
verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
|
verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPause_optimizationModeChanged_logPreference() throws Exception {
|
||||||
|
final String packageName = "testPackageName";
|
||||||
|
final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
|
||||||
|
final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
|
||||||
|
mFragment.mOptimizationMode = restrictedMode;
|
||||||
|
when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
|
||||||
|
when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
|
||||||
|
|
||||||
|
mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
|
||||||
|
verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
|
||||||
|
when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
|
||||||
|
mFragment.onPause();
|
||||||
|
|
||||||
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
verify(mMetricsFeatureProvider)
|
||||||
|
.action(
|
||||||
|
SettingsEnums.LEAVE_POWER_USAGE_MANAGE_BACKGROUND,
|
||||||
|
SettingsEnums.ACTION_APP_BATTERY_USAGE_OPTIMIZED,
|
||||||
|
SettingsEnums.FUELGAUGE_POWER_USAGE_MANAGE_BACKGROUND,
|
||||||
|
packageName,
|
||||||
|
/* consumed battery */ 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPause_optimizationModeIsNotChanged_notInvokeLogging() throws Exception {
|
||||||
|
final String packageName = "testPackageName";
|
||||||
|
final int restrictedMode = BatteryOptimizeUtils.MODE_RESTRICTED;
|
||||||
|
final int optimizedMode = BatteryOptimizeUtils.MODE_OPTIMIZED;
|
||||||
|
mFragment.mOptimizationMode = restrictedMode;
|
||||||
|
when(mBatteryOptimizeUtils.getPackageName()).thenReturn(packageName);
|
||||||
|
when(mInstallSourceInfo.getInitiatingPackageName()).thenReturn("com.android.vending");
|
||||||
|
|
||||||
|
mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ true);
|
||||||
|
verify(mBatteryOptimizeUtils).setAppUsageState(optimizedMode, Action.APPLY);
|
||||||
|
when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(optimizedMode);
|
||||||
|
mFragment.onCheckedChanged(mMockSwitch, /* isChecked= */ false);
|
||||||
|
verify(mBatteryOptimizeUtils).setAppUsageState(restrictedMode, Action.APPLY);
|
||||||
|
when(mBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(restrictedMode);
|
||||||
|
mFragment.onPause();
|
||||||
|
|
||||||
|
TimeUnit.SECONDS.sleep(1);
|
||||||
|
verifyNoInteractions(mMetricsFeatureProvider);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user