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

Commit 39d0b553 authored by Piotr Karzelek (xWF)'s avatar Piotr Karzelek (xWF) Committed by Android (Google) Code Review
Browse files

Merge "move multi-user and enterprise annotations to the modules" into main

parents f7faa164 21b6c11c

packages/SettingsProvider/test/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        <option name="package" value="com.android.providers.setting.test" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" />

        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" />

        <option name="exclude-annotation" value="com.android.bedstead.enterprise.annotations.RequireRunOnWorkProfile" />

        <option name="exclude-annotation" value="com.android.bedstead.multiuser.annotations.RequireRunOnSecondaryUser" />

    </test>

</configuration>

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ import com.android.bedstead.enterprise.annotations.EnsureHasNoWorkProfile; 
import com.android.bedstead.enterprise.annotations.EnsureHasWorkProfile;

import com.android.bedstead.harrier.BedsteadJUnit4;

import com.android.bedstead.harrier.DeviceState;

import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;

import com.android.bedstead.harrier.annotations.RequireFeature;

import com.android.bedstead.harrier.annotations.RequireRunOnInitialUser;

import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;

import com.android.bedstead.multiuser.annotations.EnsureHasSecondaryUser;

import com.android.bedstead.multiuser.annotations.RequireRunOnPrimaryUser;

import com.android.bedstead.nene.TestApis;

import com.android.bedstead.nene.users.UserReference;

import com.android.bedstead.nene.users.UserType;

services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import androidx.test.platform.app.InstrumentationRegistry; 


import com.android.bedstead.harrier.BedsteadJUnit4;

import com.android.bedstead.harrier.DeviceState;

import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;

import com.android.bedstead.multiuser.annotations.EnsureHasSecondaryUser;

import com.android.bedstead.nene.users.UserReference;

import com.android.compatibility.common.util.PollingCheck;

import com.android.compatibility.common.util.TestUtils;