summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-08 19:50:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-08 19:50:31 +0000
commit067a72edc7b4b8e600f093011c2c50a640bd57c3 (patch)
treee482919bba3fd71a053123e4174068521bb7ec67
parente36cfec2b6a30865866b5262bead35b9356793a6 (diff)
parentebe2d4735adb88bfab5a1d84878b9211d12f8f6b (diff)
downloadcts-tmp_amf_315507370.tar.gz
Merge "Merge "Disable Low Power Standby" into android14-tests-dev am: 6df3e182b2" into main am: ebe2d4735atmp_amf_315507370
Original change: https://android-review.googlesource.com/c/platform/cts/+/2863225 Change-Id: Ibd38f4e9e72d27e162618a32c42807f9079a61e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/JobScheduler/Android.bp1
-rw-r--r--tests/JobScheduler/src/android/jobscheduler/cts/UserInitiatedJobTest.java17
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/JobScheduler/Android.bp b/tests/JobScheduler/Android.bp
index 53e3adc00d0..a857c0c00fc 100644
--- a/tests/JobScheduler/Android.bp
+++ b/tests/JobScheduler/Android.bp
@@ -24,6 +24,7 @@ android_test {
"androidx.test.uiautomator_uiautomator",
"androidx.test.rules",
"cts-wm-util",
+ "Harrier",
],
libs: ["android.test.base"],
srcs: [
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/UserInitiatedJobTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/UserInitiatedJobTest.java
index 0acb5b4c34f..5b0c22a96f3 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/UserInitiatedJobTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/UserInitiatedJobTest.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
+import android.Manifest;
import android.app.ActivityManager;
import android.app.Instrumentation;
import android.app.job.JobParameters;
@@ -36,6 +37,7 @@ import android.content.pm.ApplicationInfo;
import android.jobscheduler.cts.jobtestapp.TestFgsService;
import android.jobscheduler.cts.jobtestapp.TestJobSchedulerReceiver;
import android.os.ParcelFileDescriptor;
+import android.os.PowerManager;
import android.os.SystemClock;
import android.os.UserHandle;
import android.provider.Settings;
@@ -46,6 +48,8 @@ import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import androidx.test.uiautomator.UiDevice;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
import com.android.compatibility.common.util.CallbackAsserter;
import com.android.compatibility.common.util.ScreenUtils;
import com.android.compatibility.common.util.SystemUtil;
@@ -73,11 +77,13 @@ public class UserInitiatedJobTest {
private static final int JOB_ID = UserInitiatedJobTest.class.hashCode();
private Context mContext;
+ private PowerManager mPowerManager;
private UiDevice mUiDevice;
private TestAppInterface mTestAppInterface;
private NetworkingHelper mNetworkingHelper;
private String mInitialActivityManagerConstants;
+ private boolean mInitialLowPowerStandbyEnabled;
@Before
public void setUp() throws Exception {
@@ -96,6 +102,13 @@ public class UserInitiatedJobTest {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.ACTIVITY_MANAGER_CONSTANTS, "background_settle_time=0");
SystemUtil.runShellCommand("am set-deterministic-uid-idle true");
+
+ mPowerManager = mContext.getSystemService(PowerManager.class);
+ mInitialLowPowerStandbyEnabled = mPowerManager.isLowPowerStandbyEnabled();
+ try (PermissionContext p = TestApis.permissions().withPermission(
+ Manifest.permission.MANAGE_LOW_POWER_STANDBY)) {
+ mPowerManager.setLowPowerStandbyEnabled(false);
+ }
}
@After
@@ -105,6 +118,10 @@ public class UserInitiatedJobTest {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.ACTIVITY_MANAGER_CONSTANTS, mInitialActivityManagerConstants);
SystemUtil.runShellCommand("am set-deterministic-uid-idle false");
+ try (PermissionContext p = TestApis.permissions().withPermission(
+ Manifest.permission.MANAGE_LOW_POWER_STANDBY)) {
+ mPowerManager.setLowPowerStandbyEnabled(mInitialLowPowerStandbyEnabled);
+ }
}
@Test