PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be

Browse Source 
Change-Id: I70421ccd985810c8a17910b71986f12296fc65f5
This commit is contained in:
Anthony Stange
2020-03-18 21:55:15 +00:00
committed by Automerger Merge Worker
parent d19b162a1b 95975931be
commit c984a18721
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/compat/PlatformCompatDashboard.java
View File

@@ -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);
}

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

@@ -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()))