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

Merge "Adds 'more details' hyper link." into sc-dev am: c08943784c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da3a8ced8594349dd7e01063b0d2f3cae253883
This commit is contained in:
Yi Jiang
2021-03-04 18:58:16 +00:00
committed by Automerger Merge Worker
parent 81a1df8f46 c08943784c
commit 05a310b89b
2 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
View File

@@ -23,6 +23,7 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -138,6 +139,7 @@ public class ScreenTimeoutSettingsTest {
public void updateCandidates_enforcedAdmin_showDisabledByAdminPreference() {
mSettings.mAdmin = new RestrictedLockUtils.EnforcedAdmin();
mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
doNothing().when(mSettings).setupDisabledFooterPreference();
mSettings.updateCandidates();