Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 855c75f7 authored May 18, 2020 by TreeHugger Robot Committed by Automerger Merge Worker May 18, 2020

Merge "Reduce widget exemption status." into rvc-dev am: 691ca6fd am: 6b558c19

Change-Id: Id36cb5a9379318abb3755f38dca43a7e57c62fb5

parents ca6fd626 6b558c19

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1098,8 +1098,7 @@ public class AppStandbyController implements AppStandbyInternal {

	if (mAppWidgetManager != null		if (mAppWidgetManager != null
	&& mInjector.isBoundWidgetPackage(mAppWidgetManager, packageName, userId)) {		&& mInjector.isBoundWidgetPackage(mAppWidgetManager, packageName, userId)) {
	// TODO: consider lowering to ACTIVE		return STANDBY_BUCKET_ACTIVE;
	return STANDBY_BUCKET_EXEMPTED;
	}		}

	if (isDeviceProvisioningPackage(packageName)) {		if (isDeviceProvisioningPackage(packageName)) {

services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -387,7 +387,7 @@ public class AppStandbyControllerTests {
	@Test		@Test
	public void testBoundWidgetPackageExempt() throws Exception {		public void testBoundWidgetPackageExempt() throws Exception {
	assumeTrue(mInjector.getContext().getSystemService(AppWidgetManager.class) != null);		assumeTrue(mInjector.getContext().getSystemService(AppWidgetManager.class) != null);
	assertEquals(STANDBY_BUCKET_EXEMPTED,		assertEquals(STANDBY_BUCKET_ACTIVE,
	mController.getAppStandbyBucket(PACKAGE_EXEMPTED_1, USER_ID,		mController.getAppStandbyBucket(PACKAGE_EXEMPTED_1, USER_ID,
	mInjector.mElapsedRealtime, false));		mInjector.mElapsedRealtime, false));
	}		}