Add @EnsureHasDelegate
Delegates will be accessed via .dpc() which allows us to extend the
generic testing strategy to also include delegates. The next CL will add
delegates to the parameterized tests.
Test: atest RemoteDPCTest
Test: atest HarrierTest
Bug: 197906636
Bug: 198407058
Change-Id: Ia28fe309feb53335e9a85de3791c2ecf86df3a7a
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
index 9bfec32..b2d3817b 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
@@ -60,6 +60,7 @@
import com.android.bedstead.harrier.annotations.RequireSdkVersion;
import com.android.bedstead.harrier.annotations.RequireUserSupported;
import com.android.bedstead.harrier.annotations.TestTag;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoProfileOwner;
@@ -85,7 +86,11 @@
import com.android.bedstead.nene.utils.ShellCommand;
import com.android.bedstead.nene.utils.Tags;
import com.android.bedstead.nene.utils.Versions;
+import com.android.bedstead.remotedpc.RemoteDelegate;
import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
import com.android.compatibility.common.util.BlockingBroadcastReceiver;
import com.android.eventlib.EventLogs;
@@ -346,6 +351,17 @@
continue;
}
+ if (annotation instanceof EnsureHasDelegate) {
+ EnsureHasDelegate ensureHasDelegateAnnotation =
+ (EnsureHasDelegate) annotation;
+ ensureHasDelegate(
+ ensureHasDelegateAnnotation.admin(),
+ Arrays.asList(ensureHasDelegateAnnotation.scopes()),
+ ensureHasDelegateAnnotation.isPrimary());
+ continue;
+ }
+
+
if (annotation instanceof EnsureHasDeviceOwner) {
EnsureHasDeviceOwner ensureHasDeviceOwnerAnnotation =
(EnsureHasDeviceOwner) annotation;
@@ -878,7 +894,7 @@
mProfiles = new HashMap<>();
private DevicePolicyController mDeviceOwner;
private Map<UserReference, DevicePolicyController> mProfileOwners = new HashMap<>();
- private DevicePolicyController mPrimaryDpc;
+ private RemotePolicyManager mPrimaryPolicyManager;
private final List<UserReference> mCreatedUsers = new ArrayList<>();
private final List<UserBuilder> mRemovedUsers = new ArrayList<>();
@@ -1291,9 +1307,11 @@
broadcastReceiver.unregisterQuietly();
}
mRegisteredBroadcastReceivers.clear();
- mPrimaryDpc = null;
+ mPrimaryPolicyManager = null;
}
+ private Set<TestAppInstance> mInstalledTestApps = new HashSet<>();
+
private void teardownShareableState() {
if (mOriginalSwitchedUser != null) {
if (!mOriginalSwitchedUser.exists()) {
@@ -1353,6 +1371,11 @@
}
mRemovedUsers.clear();
+
+ for (TestAppInstance installedTestApp : mInstalledTestApps) {
+ installedTestApp.uninstall();
+ }
+ mInstalledTestApps.clear();
}
private UserReference createProfile(
@@ -1394,16 +1417,57 @@
}
}
+ private void ensureHasDelegate(
+ EnsureHasDelegate.AdminType adminType, List<String> scopes, boolean isPrimary) {
+ RemoteDpc dpc = getDeviceAdmin(adminType);
+
+ if (isPrimary && mPrimaryPolicyManager != null) {
+ throw new IllegalStateException(
+ "Only one DPC can be marked as primary per test (current primary is "
+ + mPrimaryPolicyManager + ")");
+ }
+
+ if (!dpc.user().equals(TestApis.users().instrumented())) {
+ // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
+ ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
+ }
+
+ ensureTestAppInstalled(RemoteDelegate.sTestApp, dpc.user());
+ RemoteDelegate delegate = new RemoteDelegate(RemoteDelegate.sTestApp, dpc().user());
+ dpc.devicePolicyManager().setDelegatedScopes(
+ dpc.componentName(), delegate.packageName(), scopes);
+
+ if (isPrimary) {
+ mPrimaryPolicyManager = delegate;
+ }
+ }
+
+ private RemoteDpc getDeviceAdmin(EnsureHasDelegate.AdminType adminType) {
+ switch (adminType) {
+ case DEVICE_OWNER:
+ return deviceOwner();
+ case PROFILE_OWNER:
+ return profileOwner();
+ default:
+ throw new IllegalStateException("Unknown device admin type " + adminType);
+ }
+ }
+
+ private void ensureTestAppInstalled(TestApp testApp, UserReference user) {
+ mInstalledTestApps.add(testApp.install(user));
+ }
+
private void ensureHasDeviceOwner(FailureMode failureMode, boolean isPrimary,
Set<String> affiliationIds) {
// TODO(scottjonathan): Should support non-remotedpc device owner (default to remotedpc)
UserReference userReference = TestApis.users().system();
- if (isPrimary && mPrimaryDpc != null && !userReference.equals(mPrimaryDpc.user())) {
+ if (isPrimary && mPrimaryPolicyManager != null && !userReference.equals(
+ mPrimaryPolicyManager.user())) {
throw new IllegalStateException(
"Only one DPC can be marked as primary per test (current primary is "
- + mPrimaryDpc + ")");
+ + mPrimaryPolicyManager + ")");
}
if (!userReference.equals(TestApis.users().instrumented())) {
// INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
@@ -1455,7 +1519,7 @@
}
if (isPrimary) {
- mPrimaryDpc = mDeviceOwner;
+ mPrimaryPolicyManager = RemoteDpc.forDevicePolicyController(mDeviceOwner);
}
RemoteDpc.forDevicePolicyController(mDeviceOwner)
@@ -1471,7 +1535,8 @@
private void ensureHasProfileOwner(
UserReference user, boolean isPrimary, Set<String> affiliationIds) {
- if (isPrimary && mPrimaryDpc != null && !user.equals(mPrimaryDpc.user())) {
+ if (isPrimary && mPrimaryPolicyManager != null
+ && !user.equals(mPrimaryPolicyManager.user())) {
throw new IllegalStateException("Only one DPC can be marked as primary per test");
}
@@ -1501,7 +1566,7 @@
}
if (isPrimary) {
- mPrimaryDpc = mProfileOwners.get(user);
+ mPrimaryPolicyManager = RemoteDpc.forDevicePolicyController(mProfileOwners.get(user));
}
if (affiliationIds != null) {
@@ -1670,20 +1735,22 @@
}
/**
- * Get the most appropriate {@link RemoteDpc} instance for the device state.
+ * Get the most appropriate {@link RemotePolicyManager} instance for the device state.
*
* <p>This method should only be used by tests which are annotated with {@link PolicyTest}.
*
- * <p>If no DPC is set as the "primary" DPC for the device state, then this method will first
+ * <p>This may be a DPC, a delegate, or a normal app with or without given permissions.
+ *
+ * <p>If no policy manager is set as "primary" for the device state, then this method will first
* check for a profile owner in the current user, or else check for a device owner.
*
* <p>If no Harrier-managed profile owner or device owner exists, an exception will be thrown.
*
* <p>If the profile owner or device owner is not a RemoteDPC then an exception will be thrown.
*/
- public RemoteDpc dpc() {
- if (mPrimaryDpc != null) {
- return RemoteDpc.forDevicePolicyController(mPrimaryDpc);
+ public RemotePolicyManager dpc() {
+ if (mPrimaryPolicyManager != null) {
+ return mPrimaryPolicyManager;
}
if (mProfileOwners.containsKey(TestApis.users().instrumented())) {
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java
index c588ace..01a0f0f 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java
@@ -148,7 +148,7 @@
// This must contain one key for every APPLIED_BY that is being used, and maps to the "default" for testing that DPC type
// in general this will be a state which runs on the same user as the dpc.
private static final ImmutableMap<Integer, Annotation> DPC_STATE_ANNOTATIONS = ImmutableMap.<Integer, Annotation>builder()
- .put(APPLIED_BY_DEVICE_OWNER, includeRunOnDeviceOwnerUser())
+ .put(APPLIED_BY_DEVICE_OWNER, includeRunOnNonAffiliatedDeviceOwnerSecondaryUser())
.put(APPLIED_BY_AFFILIATED_PROFILE_OWNER, includeRunOnAffiliatedProfileOwnerSecondaryUser())
.put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER, includeRunOnProfileOwnerPrimaryUser())
.put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO, includeRunOnProfileOwnerPrimaryUser())
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
new file mode 100644
index 0000000..9db6cc7
--- /dev/null
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that the given admin delegates the given scope to a test app.
+ *
+ * <p>You should use {@link DeviceState} to ensure that the device enters
+ * the correct state for the method. You can use {@link DeviceState#delegate()} to interact with
+ * the delegate.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureHasDelegate {
+
+ enum AdminType {
+ DEVICE_OWNER,
+ PROFILE_OWNER
+ }
+
+ /** The admin that should delegate this scope. */
+ AdminType admin();
+
+ /** The scope being delegated. */
+ String[] scopes();
+
+ /**
+ * Whether this delegate should be returned by calls to {@link DeviceState#policyManager()}.
+ *
+ * <p>Only one policy manager per test should be marked as primary.
+ */
+ boolean isPrimary() default false;
+
+ /**
+ * Weight sets the order that annotations will be resolved.
+ *
+ * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+ *
+ * <p>If there is an order requirement between annotations, ensure that the weight of the
+ * annotation which must be resolved first is lower than the one which must be resolved later.
+ *
+ * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+ */
+ int weight() default DO_PO_WEIGHT + 1; // Should run after setting DO/PO
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
index 483a73e..2fdfc9d 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
@@ -49,13 +49,17 @@
@Retention(RetentionPolicy.RUNTIME)
@RequireFeature(FEATURE_DEVICE_ADMIN)
public @interface EnsureHasDeviceOwner {
+
+ int DO_PO_WEIGHT = MIDDLE;
+
/** Behaviour if the device owner cannot be set. */
FailureMode failureMode() default FailureMode.FAIL;
/**
- * Whether this DPC should be returned by calls to {@link DeviceState#dpc()}.
+ * Whether this DPC should be returned by calls to {@link DeviceState#dpc()} or
+ * {@link DeviceState#policyManager()}}.
*
- * <p>Only one device policy controller per test should be marked as primary.
+ * <p>Only one policy manager per test should be marked as primary.
*/
boolean isPrimary() default false;
@@ -74,5 +78,5 @@
*
* <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
*/
- int weight() default MIDDLE;
+ int weight() default DO_PO_WEIGHT;
}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
index 197a5fb..307b554 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
@@ -16,7 +16,7 @@
package com.android.bedstead.harrier.annotations.enterprise;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
import com.android.bedstead.harrier.DeviceState;
import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
@@ -47,5 +47,5 @@
*
* <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
*/
- int weight() default MIDDLE;
+ int weight() default DO_PO_WEIGHT;
}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
index 72881ba..c97fd7f 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
@@ -16,7 +16,7 @@
package com.android.bedstead.harrier.annotations.enterprise;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
import com.android.bedstead.harrier.DeviceState;
import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
@@ -53,5 +53,5 @@
*
* <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
*/
- int weight() default MIDDLE;
+ int weight() default DO_PO_WEIGHT;
}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
index 2d24990..561da3c 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
@@ -17,7 +17,7 @@
package com.android.bedstead.harrier.annotations.enterprise;
import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
import com.android.bedstead.harrier.DeviceState;
import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
@@ -49,5 +49,5 @@
*
* <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
*/
- int weight() default MIDDLE;
+ int weight() default DO_PO_WEIGHT;
}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
index eb5c9e6..a408a4d 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
@@ -19,7 +19,7 @@
import static android.content.pm.PackageManager.FEATURE_DEVICE_ADMIN;
import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
import com.android.bedstead.harrier.DeviceState;
import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
@@ -45,9 +45,10 @@
DeviceState.UserType onUser() default CURRENT_USER;
/**
- * Whether this DPC should be returned by calls to {@link DeviceState#dpc()}.
+ * Whether this DPC should be returned by calls to {@link DeviceState#dpc()} or
+ * {@link DeviceState#policyManager()}}.
*
- * <p>Only one device policy controller per test should be marked as primary.
+ * <p>Only one policy manager per test should be marked as primary.
*/
boolean isPrimary() default false;
@@ -66,5 +67,5 @@
*
* <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
*/
- int weight() default MIDDLE;
+ int weight() default DO_PO_WEIGHT;
}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
index 34a738a..73823b5 100644
--- a/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
+++ b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
@@ -18,6 +18,8 @@
import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
+import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS;
+import static android.app.admin.DevicePolicyManager.DELEGATION_CERT_INSTALL;
import static android.content.pm.PackageManager.PERMISSION_DENIED;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -27,6 +29,7 @@
import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
import static com.android.bedstead.harrier.annotations.RequireCnGmsBuild.CHINA_GOOGLE_SERVICES_FEATURE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate.AdminType.DEVICE_OWNER;
import static com.android.bedstead.nene.users.UserType.MANAGED_PROFILE_TYPE_NAME;
import static com.android.bedstead.nene.users.UserType.SECONDARY_USER_TYPE_NAME;
import static com.android.bedstead.nene.users.UserType.SYSTEM_USER_TYPE_NAME;
@@ -38,6 +41,7 @@
import android.app.ActivityManager;
import android.os.Build;
import android.platform.test.annotations.AppModeFull;
+import android.os.Bundle;
import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
import com.android.bedstead.harrier.annotations.EnsureHasNoSecondaryUser;
@@ -67,6 +71,7 @@
import com.android.bedstead.harrier.annotations.RequireSdkVersion;
import com.android.bedstead.harrier.annotations.RequireUserSupported;
import com.android.bedstead.harrier.annotations.TestTag;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
@@ -82,6 +87,8 @@
import com.android.bedstead.nene.packages.Package;
import com.android.bedstead.nene.users.UserReference;
import com.android.bedstead.nene.utils.Tags;
+import com.android.bedstead.remotedpc.RemoteDelegate;
+import com.android.bedstead.remotedpc.RemoteDpc;
import org.junit.ClassRule;
import org.junit.Ignore;
@@ -628,7 +635,7 @@
@IncludeRunOnBackgroundDeviceOwnerUser
public void includeRunOnBackgroundDeviceOwnerUserAnnotation_isRunningOnDeviceOwnerUser() {
assertThat(TestApis.users().instrumented())
- .isEqualTo(sDeviceState.dpc().devicePolicyController().user());
+ .isEqualTo(sDeviceState.dpc().user());
}
@Test
@@ -706,4 +713,37 @@
public void testTagAnnoation_testTagIsSet() {
assertThat(Tags.hasTag("TestTag")).isTrue();
}
+
+ @Test
+ @EnsureHasDeviceOwner
+ @EnsureHasDelegate(admin = DEVICE_OWNER, scopes = DELEGATION_CERT_INSTALL, isPrimary = true)
+ public void ensureHasPrimaryDelegateAnnotation_dpcReturnsDelegate() {
+ assertThat(sDeviceState.dpc()).isInstanceOf(RemoteDelegate.class);
+ }
+
+ @Test
+ @EnsureHasDeviceOwner
+ @EnsureHasDelegate(admin = DEVICE_OWNER, scopes = DELEGATION_CERT_INSTALL, isPrimary = false)
+ public void ensureHasNonPrimaryDelegateAnnotation_dpcReturnsDpc() {
+ assertThat(sDeviceState.dpc()).isInstanceOf(RemoteDpc.class);
+ }
+
+ @Test
+ @EnsureHasDeviceOwner
+ @EnsureHasDelegate(admin = DEVICE_OWNER, scopes = DELEGATION_CERT_INSTALL, isPrimary = true)
+ public void ensureHasDelegateAnnotation_dpcCanUseDelegatedFunctionality() {
+ assertThat(sDeviceState.dpc().devicePolicyManager().getEnrollmentSpecificId()).isNotNull();
+ }
+
+ @Test
+ @EnsureHasDeviceOwner
+ @EnsureHasDelegate(admin = DEVICE_OWNER,
+ scopes = {DELEGATION_CERT_INSTALL, DELEGATION_APP_RESTRICTIONS}, isPrimary = true)
+ public void ensureHasDelegateAnnotation_multipleScopes_dpcCanUseAllDelegatedFunctionality() {
+ assertThat(sDeviceState.dpc().devicePolicyManager().getEnrollmentSpecificId()).isNotNull();
+ sDeviceState.dpc().devicePolicyManager()
+ .setApplicationRestrictions(
+ sDeviceState.dpc().componentName(),
+ sDeviceState.dpc().packageName(), new Bundle());
+ }
}
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java
new file mode 100644
index 0000000..714208f
--- /dev/null
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bedstead.remotedpc;
+
+import android.content.ComponentName;
+
+import androidx.annotation.Nullable;
+
+import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppProvider;
+
+/**
+ * {@link RemotePolicyManager} subclass representing an app which has been delegated to.
+ */
+public final class RemoteDelegate extends RemotePolicyManager {
+
+ private static final TestAppProvider sTestAppProvider = new TestAppProvider();
+ public static final TestApp sTestApp = sTestAppProvider.query()
+ .wherePackageName().isEqualTo("com.android.Delegate")
+ .get();
+
+ public RemoteDelegate(TestApp testApp, UserReference user) {
+ super(testApp, user);
+ }
+
+ @Nullable
+ @Override
+ public ComponentName componentName() {
+ return null;
+ }
+}
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
index ea230b2..01519a0 100644
--- a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
@@ -19,7 +19,6 @@
import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
import android.content.ComponentName;
-import android.content.Context;
import android.os.Build;
import android.os.UserHandle;
@@ -33,14 +32,10 @@
import com.android.bedstead.nene.users.UserReference;
import com.android.bedstead.nene.utils.Versions;
import com.android.bedstead.testapp.TestApp;
-import com.android.bedstead.testapp.TestAppInstance;
import com.android.bedstead.testapp.TestAppProvider;
/** Entry point to RemoteDPC. */
-public final class RemoteDpc extends TestAppInstance {
-
- // This must be instrumentation not instrumented to access the resources
- private static final Context sContext = TestApis.context().instrumentationContext();
+public final class RemoteDpc extends RemotePolicyManager {
public static final ComponentName DPC_COMPONENT_NAME = new ComponentName(
"com.android.RemoteDPC",
@@ -258,16 +253,9 @@
}
/**
- * Get the {@link TestAppInstance} for the DPC.
- *
- */
- public TestAppInstance app() {
- return sTestApp.instance(mDevicePolicyController.user());
- }
-
- /**
* Get the {@link ComponentName} of the DPC.
*/
+ @Override
public ComponentName componentName() {
return DPC_COMPONENT_NAME;
}
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java
new file mode 100644
index 0000000..8532ef3
--- /dev/null
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bedstead.remotedpc;
+
+import android.content.ComponentName;
+
+import androidx.annotation.Nullable;
+
+import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+
+/** A Remote app which can change device policy */
+public abstract class RemotePolicyManager extends TestAppInstance {
+
+ RemotePolicyManager(TestApp testApp, UserReference user) {
+ super(testApp, user);
+ }
+
+ /**
+ * Get the {@link ComponentName} of the device admin for the policy manager.
+ *
+ * <p>Null if there is no device admin
+ */
+ @Nullable
+ public abstract ComponentName componentName();
+}
diff --git a/common/device-side/bedstead/testapp/Android.bp b/common/device-side/bedstead/testapp/Android.bp
index 410f94b..bf92e97 100644
--- a/common/device-side/bedstead/testapp/Android.bp
+++ b/common/device-side/bedstead/testapp/Android.bp
@@ -99,7 +99,7 @@
java_genrule {
name: "TestApp_Apps",
- srcs: [":EmptyTestApp", ":EmptyTestApp2", ":DeviceAdminTestApp", ":LockTaskApp", ":RemoteDPCTestApp", ":SmsApp", ":AccountManagementApp"],
+ srcs: [":EmptyTestApp", ":EmptyTestApp2", ":DeviceAdminTestApp", ":LockTaskApp", ":DelegateTestApp", ":RemoteDPCTestApp", ":SmsApp", ":AccountManagementApp"],
out: ["TestApp_Apps.res.zip"],
tools: ["soong_zip", "index_testapps", "aapt2"],
cmd: "mkdir -p $(genDir)/res/raw"
@@ -107,6 +107,7 @@
+ " && cp $(location :EmptyTestApp2) $(genDir)/res/raw"
+ " && cp $(location :DeviceAdminTestApp) $(genDir)/res/raw"
+ " && cp $(location :LockTaskApp) $(genDir)/res/raw"
+ + " && cp $(location :DelegateTestApp) $(genDir)/res/raw"
+ " && cp $(location :RemoteDPCTestApp) $(genDir)/res/raw"
+ " && cp $(location :SmsApp) $(genDir)/res/raw"
+ " && cp $(location :AccountManagementApp) $(genDir)/res/raw"
@@ -152,6 +153,15 @@
}
android_test_helper_app {
+ name: "DelegateTestApp",
+ static_libs: [
+ "TestApp_TestApps"
+ ],
+ manifest: "manifests/DelegateManifest.xml",
+ min_sdk_version: "28"
+}
+
+android_test_helper_app {
name: "RemoteDPCTestApp",
static_libs: [
"TestApp_TestApps",
diff --git a/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml b/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml
new file mode 100644
index 0000000..5bd3772
--- /dev/null
+++ b/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.Delegate" android:targetSandboxVersion="2">
+
+ <application
+ android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
+
+ <!-- Don't allow this test app to be returned by queries unless filtered by package name -->
+ <meta-data android:name="testapp-package-query-only" android:value="true" />
+
+ </application>
+ <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
+</manifest>
\ No newline at end of file
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
index ce5023f..d95def6 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
@@ -53,7 +53,7 @@
PackageManager p = TestApis.context().instrumentedContext().getPackageManager();
try {
PackageInfo packageInfo = p.getPackageInfo(
- mInstance.testApp().packageName(), /* flags= */ PackageManager.GET_ACTIVITIES);
+ mInstance.packageName(), /* flags= */ PackageManager.GET_ACTIVITIES);
for (android.content.pm.ActivityInfo activityInfo : packageInfo.activities) {
if (activityInfo.name.startsWith("androidx")) {
// Special case: androidx adds non-logging activities
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
index 3eb3633..761dec6 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
@@ -55,7 +55,7 @@
return new UnresolvedTestAppActivity(mTestAppActivities.mInstance,
TestApis.packages().component(
new ComponentName(
- mTestAppActivities.mInstance.testApp().packageName(),
+ mTestAppActivities.mInstance.packageName(),
activity.className())));
}
}
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java
index 4a4b5c8..282b68d 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java
@@ -52,7 +52,7 @@
Intent bindIntent = new Intent();
bindIntent.setComponent(new ComponentName(
- mTestAppInstance.testApp().packageName(),
+ mTestAppInstance.packageName(),
bindToService.getClassName()));
Log.i(LOG_TAG, "Attempting to bind to " + bindIntent);
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
index a0db3b4..2a925dd 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
@@ -73,238 +73,238 @@
@Override
public ActivityCreatedEvent.ActivityCreatedEventQuery activityCreated() {
return ActivityCreatedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityDestroyedEvent.ActivityDestroyedEventQuery activityDestroyed() {
return ActivityDestroyedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityPausedEvent.ActivityPausedEventQuery activityPaused() {
return ActivityPausedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityRestartedEvent.ActivityRestartedEventQuery activityRestarted() {
return ActivityRestartedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityResumedEvent.ActivityResumedEventQuery activityResumed() {
return ActivityResumedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityStartedEvent.ActivityStartedEventQuery activityStarted() {
return ActivityStartedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public ActivityStoppedEvent.ActivityStoppedEventQuery activityStopped() {
return ActivityStoppedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public BroadcastReceivedEvent.BroadcastReceivedEventQuery broadcastReceived() {
return BroadcastReceivedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminBugreportFailedEvent.DeviceAdminBugreportFailedEventQuery bugReportFailed() {
return DeviceAdminBugreportFailedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminBugreportSharedEvent.DeviceAdminBugreportSharedEventQuery bugReportShared() {
return DeviceAdminBugreportSharedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminBugreportSharingDeclinedEvent.DeviceAdminBugreportSharingDeclinedEventQuery bugReportSharingDeclined() {
return DeviceAdminBugreportSharingDeclinedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminChoosePrivateKeyAliasEvent.DeviceAdminChoosePrivateKeyAliasEventQuery choosePrivateKeyAlias() {
return DeviceAdminChoosePrivateKeyAliasEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminDisabledEvent.DeviceAdminDisabledEventQuery deviceAdminDisabled() {
return DeviceAdminDisabledEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminDisableRequestedEvent.DeviceAdminDisableRequestedEventQuery deviceAdminDisableRequested() {
return DeviceAdminDisableRequestedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminEnabledEvent.DeviceAdminEnabledEventQuery deviceAdminEnabled() {
return DeviceAdminEnabledEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminLockTaskModeEnteringEvent.DeviceAdminLockTaskModeEnteringEventQuery lockTaskModeEntering() {
return DeviceAdminLockTaskModeEnteringEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminLockTaskModeExitingEvent.DeviceAdminLockTaskModeExitingEventQuery lockTaskModeExiting() {
return DeviceAdminLockTaskModeExitingEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminNetworkLogsAvailableEvent.DeviceAdminNetworkLogsAvailableEventQuery networkLogsAvailable() {
return DeviceAdminNetworkLogsAvailableEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminOperationSafetyStateChangedEvent.DeviceAdminOperationSafetyStateChangedEventQuery operationSafetyStateChanged() {
return DeviceAdminOperationSafetyStateChangedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminPasswordChangedEvent.DeviceAdminPasswordChangedEventQuery passwordChanged() {
return DeviceAdminPasswordChangedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminPasswordExpiringEvent.DeviceAdminPasswordExpiringEventQuery passwordExpiring() {
return DeviceAdminPasswordExpiringEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminPasswordFailedEvent.DeviceAdminPasswordFailedEventQuery passwordFailed() {
return DeviceAdminPasswordFailedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminPasswordSucceededEvent.DeviceAdminPasswordSucceededEventQuery passwordSucceeded() {
return DeviceAdminPasswordSucceededEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminProfileProvisioningCompleteEvent.DeviceAdminProfileProvisioningCompleteEventQuery profileProvisioningComplete() {
return DeviceAdminProfileProvisioningCompleteEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminReadyForUserInitializationEvent.DeviceAdminReadyForUserInitializationEventQuery readyForUserInitialization() {
return DeviceAdminReadyForUserInitializationEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminSecurityLogsAvailableEvent.DeviceAdminSecurityLogsAvailableEventQuery securityLogsAvailable() {
return DeviceAdminSecurityLogsAvailableEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminSystemUpdatePendingEvent.DeviceAdminSystemUpdatePendingEventQuery systemUpdatePending() {
return DeviceAdminSystemUpdatePendingEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent.DeviceAdminTransferAffiliatedProfileOwnershipCompleteEventQuery transferAffiliatedProfileOwnershipComplete() {
return DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminTransferOwnershipCompleteEvent.DeviceAdminTransferOwnershipCompleteEventQuery transferOwnershipComplete() {
return DeviceAdminTransferOwnershipCompleteEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminUserAddedEvent.DeviceAdminUserAddedEventQuery userAdded() {
return DeviceAdminUserAddedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminUserRemovedEvent.DeviceAdminUserRemovedEventQuery userRemoved() {
return DeviceAdminUserRemovedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminUserStartedEvent.DeviceAdminUserStartedEventQuery userStarted() {
return DeviceAdminUserStartedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminUserStoppedEvent.DeviceAdminUserStoppedEventQuery userStopped() {
return DeviceAdminUserStoppedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
@Override
public DeviceAdminUserSwitchedEvent.DeviceAdminUserSwitchedEventQuery userSwitched() {
return DeviceAdminUserSwitchedEvent.queryPackage(
- mTestApp.testApp().packageName())
+ mTestApp.packageName())
.onUser(mTestApp.user());
}
}
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
index 56e0443..cea69a3 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
@@ -115,6 +115,13 @@
}
/**
+ * See {@link TestApp#packageName()}.
+ */
+ public String packageName() {
+ return testApp().packageName();
+ }
+
+ /**
* The {@link UserReference} this instance refers to.
*/
public UserReference user() {
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
index 3038849..955a078 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
@@ -38,7 +38,7 @@
internal fun DeviceState.getWorkDevicePolicyManager() =
profileOwner(workProfile(DeviceState.UserType.PRIMARY_USER))!!
- .app().devicePolicyManager()
+ .devicePolicyManager()
internal fun <T> withUserContext(user: UserReference, block: (context: Context) -> T) =
TestApis.permissions()
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
index 3ed02e8..93b0f9d8 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
@@ -42,7 +42,7 @@
import com.android.bedstead.harrier.policies.AccountManagement;
import com.android.bedstead.nene.TestApis;
import com.android.bedstead.nene.utils.Poll;
-import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
import com.android.bedstead.testapp.TestApp;
import com.android.bedstead.testapp.TestAppInstance;
import com.android.bedstead.testapp.TestAppProvider;
@@ -85,8 +85,8 @@
@Before
public void setUp() {
- RemoteDpc dpc = sDeviceState.dpc();
- mAdmin = dpc.devicePolicyController().componentName();
+ RemotePolicyManager dpc = sDeviceState.dpc();
+ mAdmin = dpc.componentName();
mDpm = dpc.devicePolicyManager();
mAccountManager = sContext.getSystemService(AccountManager.class);
}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
index 473c60e..9959fc8 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
@@ -37,7 +37,7 @@
import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
import com.android.bedstead.harrier.policies.DefaultSmsApplication;
import com.android.bedstead.nene.TestApis;
-import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
import com.android.bedstead.testapp.TestApp;
import com.android.bedstead.testapp.TestAppInstance;
import com.android.bedstead.testapp.TestAppProvider;
@@ -71,8 +71,8 @@
@Before
public void setUp() {
- RemoteDpc dpc = sDeviceState.dpc();
- mAdmin = dpc.devicePolicyController().componentName();
+ RemotePolicyManager dpc = sDeviceState.dpc();
+ mAdmin = dpc.componentName();
mDpm = dpc.devicePolicyManager();
mTelephonyManager = sContext.getSystemService(TelephonyManager.class);
}
@@ -85,9 +85,9 @@
assumeTrue(mTelephonyManager.isSmsCapable());
String previousSmsAppName = getDefaultSmsPackage();
try (TestAppInstance smsApp = sSmsApp.install()) {
- mDpm.setDefaultSmsApplication(mAdmin, smsApp.testApp().packageName());
+ mDpm.setDefaultSmsApplication(mAdmin, smsApp.packageName());
- assertThat(getDefaultSmsPackage()).isEqualTo(smsApp.testApp().packageName());
+ assertThat(getDefaultSmsPackage()).isEqualTo(smsApp.packageName());
} finally {
mDpm.setDefaultSmsApplication(mAdmin, previousSmsAppName);
}
@@ -101,7 +101,7 @@
assumeTrue(mTelephonyManager.isSmsCapable());
String previousSmsAppName = getDefaultSmsPackage();
try (TestAppInstance smsApp = sSmsApp.install()) {
- mDpm.setDefaultSmsApplication(mAdmin, smsApp.testApp().packageName());
+ mDpm.setDefaultSmsApplication(mAdmin, smsApp.packageName());
assertThat(getDefaultSmsPackage()).isEqualTo(previousSmsAppName);
} finally {
@@ -134,7 +134,7 @@
assertThrows(NullPointerException.class, () ->
mDpm.setDefaultSmsApplication(
- /* admin= */ null, smsApp.testApp().packageName()));
+ /* admin= */ null, smsApp.packageName()));
}
}
@@ -146,7 +146,7 @@
assumeTrue(!mTelephonyManager.isSmsCapable());
String previousSmsAppName = getDefaultSmsPackage();
try (TestAppInstance smsApp = sSmsApp.install()) {
- mDpm.setDefaultSmsApplication(mAdmin, smsApp.testApp().packageName());
+ mDpm.setDefaultSmsApplication(mAdmin, smsApp.packageName());
assertThat(getDefaultSmsPackage()).isEqualTo(previousSmsAppName);
} finally {
@@ -161,7 +161,7 @@
try (TestAppInstance smsApp = sSmsApp.install()) {
assertThrows(SecurityException.class, () ->
- mDpm.setDefaultSmsApplication(mAdmin, smsApp.testApp().packageName()));
+ mDpm.setDefaultSmsApplication(mAdmin, smsApp.packageName()));
}
}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DeprecatedPasswordAPIsTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DeprecatedPasswordAPIsTest.java
index 2579f14..fa0ebb8 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DeprecatedPasswordAPIsTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DeprecatedPasswordAPIsTest.java
@@ -32,7 +32,7 @@
import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
import com.android.bedstead.harrier.policies.DeprecatedPasswordAPIs;
import com.android.bedstead.nene.TestApis;
-import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
import org.junit.Before;
import org.junit.ClassRule;
@@ -57,8 +57,8 @@
@Before
public void setUp() {
- RemoteDpc dpc = sDeviceState.dpc();
- mAdmin = dpc.devicePolicyController().componentName();
+ RemotePolicyManager dpc = sDeviceState.dpc();
+ mAdmin = dpc.componentName();
mDpm = dpc.devicePolicyManager();
}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
index f3873bb..57c8253 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
@@ -31,7 +31,7 @@
import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
import com.android.bedstead.harrier.policies.SupportMessage;
import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
-import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
import org.junit.After;
import org.junit.Before;
@@ -67,8 +67,8 @@
@Before
public void setUp() {
- RemoteDpc dpc = sDeviceState.dpc();
- mAdmin = dpc.devicePolicyController().componentName();
+ RemotePolicyManager dpc = sDeviceState.dpc();
+ mAdmin = dpc.componentName();
mDevicePolicyManager = dpc.devicePolicyManager();
}
