summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pat Manning <patmanning@google.com> 2022-03-08 17:05:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-03-08 17:05:15 +0000
commit4936ff4bf3b68615fb13d2d10d88d1a2496976e2 (patch)
tree74849e31b1903ac45dfe0c66d295748772786015
parent04720f26fedfff857c0a8013cd1dbd8d07429218 (diff)
parentc0925b5a43596052f25c36fde7e01f580dcfc918 (diff)
Merge "Start/end the navbar proto tokens in the secure settings dump logic." into tm-dev
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 1c5bf81faf3e..3c29a803ffbb 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,