| commit | 589738054e0f8f82700bf072aa21d607d208901d | [log] [tgz] |
|---|---|---|
| author | Yao Chen <yaochen@google.com> | Wed Apr 24 19:26:32 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 24 19:26:32 2019 -0700 |
| tree | 48f112032954c03d7fca7fb5cadbbafed8f23cd9 | |
| parent | ccf163bfb6b491c5ce711538f7dfa581a4ccbe06 [diff] | |
| parent | ffd354d6a4883796fb6cf53e22acbcb77c56612a [diff] |
Merge "Fix SettingsProto corruption" into qt-dev am: ffd354d6a4 Change-Id: Ic60a1b9805c214454e558b729606f861e56d5a87
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index c204f26..cd4f6cf 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -1236,6 +1236,8 @@ 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,