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

Commit 14433db1 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Add DPMS test as presubmit test."

parents 7142e18d c14b317d

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ import android.os.Bundle; 
import android.os.Process;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;

import android.provider.Settings;

import android.security.KeyChain;

import android.security.KeyChain;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;
@@ -112,6 +113,7 @@ import java.util.concurrent.TimeUnit; 
 * runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

 * runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

 */

 */

@SmallTest

@SmallTest

@Presubmit

public class DevicePolicyManagerTest extends DpmTestBase {

public class DevicePolicyManagerTest extends DpmTestBase {

    private static final List<String> OWNER_SETUP_PERMISSIONS = Arrays.asList(

    private static final List<String> OWNER_SETUP_PERMISSIONS = Arrays.asList(

            permission.MANAGE_DEVICE_ADMINS, permission.MANAGE_PROFILE_AND_DEVICE_OWNERS,

            permission.MANAGE_DEVICE_ADMINS, permission.MANAGE_PROFILE_AND_DEVICE_OWNERS,