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

Commit 92297947 authored by Benjamin Franz's avatar Benjamin Franz Committed by Automerger Merge Worker
Browse files

Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
parents 8c2b2cc8 39a920dd

tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java

+12 −9
Original line number Diff line number Diff line
@@ -88,14 +88,16 @@ public class PlatformCompatDashboardTest { 
    public void setUp() throws RemoteException, NameNotFoundException {

        MockitoAnnotations.initMocks(this);

        mChanges = new CompatibilityChangeInfo[5];

        mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, 0, false, false, "");

        mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, 0, true, false, "");

        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_Since_SDK_1_1", -1, 1, false, false,

                                                  "");

        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_Since_SDK_1_2", -1, 1, false, false,

                                                  "");

        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_Since_SDK_2", -1, 2, false, false,

                                                  "");

        mChanges[0] = new CompatibilityChangeInfo(

                1L, "Default_Enabled", 0, 0, false, false, "", false);

        mChanges[1] = new CompatibilityChangeInfo(

                2L, "Default_Disabled", 0, 0, true, false, "", false);

        mChanges[2] = new CompatibilityChangeInfo(

                3L, "Enabled_Since_SDK_1_1", -1, 1, false, false, "", false);

        mChanges[3] = new CompatibilityChangeInfo(

                4L, "Enabled_Since_SDK_1_2", -1, 1, false, false, "", false);

        mChanges[4] = new CompatibilityChangeInfo(

                5L, "Enabled_Since_SDK_2", -1, 2, false, false, "", false);

        when(mPlatformCompat.listUIChanges()).thenReturn(mChanges);

        when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator);

        // By default, allow any change
@@ -208,7 +210,8 @@ public class PlatformCompatDashboardTest { 
        for (int i = 0; i < mChanges.length; ++i) {

            changesToAdd.add(new CompatibilityChangeInfo(mChanges[i].getId(), mChanges[i].getName(),

                    -1, mChanges[i].getEnableSinceTargetSdk(), mChanges[i].getDisabled(),

                    mChanges[i].getLoggingOnly(), mChanges[i].getDescription()));

                    mChanges[i].getLoggingOnly(), mChanges[i].getDescription(),

                    mChanges[i].getOverridable()));

        }



        PreferenceCategory category = mDashboard.createChangeCategoryPreference(changesToAdd,