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

Commit 2259109c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Include isValuePreservedInRestore() on dumpsys settings" into main

parents 6678e8ef 583b8f25

core/proto/android/providers/settings/common.proto

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ message SettingProto { 


    // Whether the default is set by the system

    optional bool default_from_system = 6;



    // Whether the value is ignored when restoring from backup

    optional bool preserved_in_restore = 7;

}



message SettingsOperationProto {

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+1 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,7 @@ class SettingsProtoDumpUtil { 
            proto.write(SettingProto.DEFAULT_VALUE, setting.getDefaultValue());

            proto.write(SettingProto.DEFAULT_FROM_SYSTEM, setting.isDefaultFromSystem());

        }

        proto.write(SettingProto.PRESERVED_IN_RESTORE, setting.isValuePreservedInRestore());

        proto.end(settingsToken);

    }

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -988,6 +988,11 @@ public class SettingsProvider extends ContentProvider { 
            if (setting.getTag() != null) {

                pw.print(" tag:"); pw.print(setting.getTag());

            }

            // The majority of settings are preserved in restore, so we're just dumping those that

            // are not (to save space).

            if (!setting.isValuePreservedInRestore()) {

                pw.println(" notPreservedInRestore");

            }

            pw.println();

        }

    }