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

Commit 8297bbe5 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Automerger Merge Worker
Browse files

Merge "Fix a few tests" into tm-dev am: 1db2b7ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045947

Change-Id: Ia430aa6c55cbe27fc6fa9cf10d04094528fd2f91
parents 73a00b6e 1db2b7ce

packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import org.robolectric.RobolectricTestRunner; 
public final class ActionDisabledLearnMoreButtonLauncherTest {



    private static final int CONTEXT_USER_ID = -ENFORCEMENT_ADMIN_USER_ID;

    private static final UserHandle CONTEXT_USER = UserHandle.of(CONTEXT_USER_ID);

    private static final UserHandle CONTEXT_USER = new UserHandle(CONTEXT_USER_ID);



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();

packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import org.robolectric.android.controller.ActivityController; 
@RunWith(RobolectricTestRunner.class)

public class ManagedDeviceActionDisabledByAdminControllerTest {



    private static UserHandle MANAGED_USER = UserHandle.of(123);

    private static UserHandle MANAGED_USER = new UserHandle(123);

    private static final String RESTRICTION = UserManager.DISALLOW_ADJUST_VOLUME;

    private static final String EMPTY_URL = "";

    private static final String SUPPORT_TITLE_FOR_RESTRICTION = DISALLOW_ADJUST_VOLUME_TITLE;