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

Commit 02808bc7 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Blacklist Night display settings for testing" into oc-dr1-dev

am: 4608c69f

Change-Id: I9af926344d9703b5754be9ef893527abf6d1a2c7
parents ccacc2d5 4608c69f
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -17,24 +17,25 @@
package android.provider;

import static com.google.android.collect.Sets.newHashSet;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;

import static java.lang.reflect.Modifier.isFinal;
import static java.lang.reflect.Modifier.isPublic;
import static java.lang.reflect.Modifier.isStatic;

import android.platform.test.annotations.Presubmit;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Set;

import org.junit.Test;
import org.junit.runner.RunWith;

/** Tests that ensure appropriate settings are backed up. */
@RunWith(AndroidJUnit4.class)
@SmallTest
@@ -446,6 +447,8 @@ public class SettingsBackupTest {
                 Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,
                 Settings.Secure.MULTI_PRESS_TIMEOUT,
                 Settings.Secure.NFC_PAYMENT_FOREGROUND,
                 Settings.Secure.NIGHT_DISPLAY_ACTIVATED,
                 Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
                 Settings.Secure.OVERVIEW_LAST_STACK_ACTIVE_TIME,
                 Settings.Secure.PACKAGE_VERIFIER_STATE,
                 Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,