From c0925b5a43596052f25c36fde7e01f580dcfc918 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Tue, 8 Mar 2022 10:32:15 +0000
Subject: [PATCH] Start/end the navbar proto tokens in the secure settings dump
 logic.

Test: atest com.android.server.cts.SettingsIncidentTest#testBasicStructure
Fix: 223214722
Change-Id: I84a15f562813e62bbb89cd417396dcca89381e4f
---
 .../com/android/providers/settings/SettingsProtoDumpUtil.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 1c5bf81faf3e8..3c29a803ffbbc 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2252,12 +2252,14 @@ class SettingsProtoDumpUtil {
                 Settings.Secure.MULTI_PRESS_TIMEOUT,
                 SecureSettingsProto.MULTI_PRESS_TIMEOUT);
 
+        final long navBar = p.start(SecureSettingsProto.NAV_BAR);
         dumpSetting(s, p,
                 Settings.Secure.NAV_BAR_FORCE_VISIBLE,
                 SecureSettingsProto.NavBar.NAV_BAR_FORCE_VISIBLE);
         dumpSetting(s, p,
                 Settings.Secure.NAV_BAR_KIDS_MODE,
                 SecureSettingsProto.NavBar.NAV_BAR_KIDS_MODE);
+        p.end(navBar);
 
         dumpSetting(s, p,
                 Settings.Secure.NAVIGATION_MODE,