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

Commit eb30161a authored by Bryan Mawhinney's avatar Bryan Mawhinney Committed by Android (Google) Code Review
Browse files

Merge "Move settings backup into separate class again"

parents 57806372 2c5f95af

core/tests/coretests/src/android/provider/SettingsTest.java→core/tests/coretests/src/android/provider/SettingsBackupTest.java

+7 −7
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ import static java.lang.reflect.Modifier.isFinal; 
import static java.lang.reflect.Modifier.isPublic;

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



import android.annotation.TargetApi;



import android.platform.test.annotations.Presubmit;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;
@@ -36,11 +35,11 @@ import java.util.Set; 
import org.junit.Test;

import org.junit.runner.RunWith;



/** Unit test for Settings. */

@TargetApi(25)

/** Tests that ensure appropriate settings are backed up. */

@RunWith(AndroidJUnit4.class)

@Presubmit

@SmallTest

public class SettingsTest {

public class SettingsBackupTest {



    /**

     * The following blacklists contain settings that should *not* be backed up and restored to
@@ -64,7 +63,6 @@ public class SettingsTest { 
                    Settings.System.NOTIFICATION_SOUND_CACHE, // internal cache

                    Settings.System.POINTER_LOCATION, // backup candidate?

                    Settings.System.RINGTONE_CACHE, // internal cache

                    Settings.System.SCREEN_BRIGHTNESS_FOR_VR, // bug?

                    Settings.System.SETUP_WIZARD_HAS_RUN, // Only used by SuW

                    Settings.System.SHOW_GTALK_SERVICE_STATUS, // candidate for backup?

                    Settings.System.SHOW_TOUCHES, // bug?
@@ -246,6 +244,7 @@ public class SettingsTest { 
                    Settings.Global.NETWORK_AVOID_BAD_WIFI,

                    Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE,

                    Settings.Global.NETWORK_PREFERENCE,

                    Settings.Global.NETWORK_RECOMMENDATIONS_PACKAGE,

                    Settings.Global.NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,

                    Settings.Global.NETWORK_SCORER_APP,

                    Settings.Global.NETWORK_SCORING_PROVISIONED,
@@ -323,6 +322,7 @@ public class SettingsTest { 
                    Settings.Global.USE_GOOGLE_MAIL,

                    Settings.Global.VT_IMS_ENABLED,

                    Settings.Global.WAIT_FOR_DEBUGGER,

                    Settings.Global.WAIT_FOR_NETWORK_TIMEOUT_MS,

                    Settings.Global.WARNING_TEMPERATURE,

                    Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,

                    Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED,
@@ -383,7 +383,6 @@ public class SettingsTest { 
                 Settings.Secure.ASSIST_STRUCTURE_ENABLED,

                 Settings.Secure.AUTO_FILL_SERVICE,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,

                 Settings.Secure.BACKUP_AUTO_RESTORE,
@@ -422,6 +421,7 @@ public class SettingsTest { 
                 Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,

                 Settings.Secure.MULTI_PRESS_TIMEOUT,

                 Settings.Secure.NFC_PAYMENT_FOREGROUND,

                 Settings.Secure.OVERVIEW_LAST_STACK_ACTIVE_TIME,

                 Settings.Secure.PACKAGE_VERIFIER_STATE,

                 Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,

                 Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,