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 am: c984a18721 am: 5c873f2087 am: 6f2143fa1c

Browse Source 
Change-Id: I786a2e1888650834c7118ecd59872a7e9d08b052
This commit is contained in:
Anthony Stange
2020-03-18 22:52:04 +00:00
committed by Automerger Merge Worker
parent 6d15bb3d0d 6f2143fa1c
commit d36930fc53
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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