Merge "Blacklist Night display settings for testing" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4608c69f23
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user