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

Commit 58973805 authored by Yao Chen's avatar Yao Chen Committed by android-build-merger
Browse files

Merge "Fix SettingsProto corruption" into qt-dev 

am: ffd354d6

Change-Id: Ic60a1b9805c214454e558b729606f861e56d5a87
parents ccf163bf ffd354d6

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

+2 −0
Original line number Diff line number Diff line
@@ -1236,6 +1236,8 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Global.SMS_SHORT_CODES_UPDATE_METADATA_URL,

                GlobalSettingsProto.Sms.SHORT_CODES_UPDATE_METADATA_URL);

        p.end(smsToken);



        final long soundsToken = p.start(GlobalSettingsProto.SOUNDS);

        dumpSetting(s, p,

                Settings.Global.CAR_DOCK_SOUND,