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

Commit 95975931 authored by Anthony Stange's avatar Anthony Stange Committed by Android (Google) Code Review
Browse files

Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev

parents 75f0bdb4 2012e670

src/com/android/settings/development/compat/PlatformCompatDashboard.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class PlatformCompatDashboard extends DashboardFragment { 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        try {

            mChanges = getPlatformCompat().listUIChanges();

            mChanges = getPlatformCompat().listAllChanges();

        } catch (RemoteException e) {

            throw new RuntimeException("Could not list changes!", e);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class PlatformCompatDashboardTest { 
        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, false, "");

        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, false, "");

        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, false, "");

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

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

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

        // By default, allow any change

        when(mOverrideValidator.getOverrideAllowedState(anyLong(),anyString()))