Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start/end the navbar proto tokens in the secure settings dump logic." into tm-dev am: 4936ff4bf3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17120370

Change-Id: I102d870748fcab305cc79cf7faab4b075f3e9f74
This commit is contained in:
Pat Manning
2022-03-08 17:13:58 +00:00
committed by Automerger Merge Worker
parent f9eac0b523 4936ff4bf3
commit 8869ce6e6e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -2252,12 +2252,14 @@ class SettingsProtoDumpUtil {
Settings.Secure.MULTI_PRESS_TIMEOUT, Settings.Secure.MULTI_PRESS_TIMEOUT,
SecureSettingsProto.MULTI_PRESS_TIMEOUT); SecureSettingsProto.MULTI_PRESS_TIMEOUT);
final long navBar = p.start(SecureSettingsProto.NAV_BAR);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.NAV_BAR_FORCE_VISIBLE, Settings.Secure.NAV_BAR_FORCE_VISIBLE,
SecureSettingsProto.NavBar.NAV_BAR_FORCE_VISIBLE); SecureSettingsProto.NavBar.NAV_BAR_FORCE_VISIBLE);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.NAV_BAR_KIDS_MODE, Settings.Secure.NAV_BAR_KIDS_MODE,
SecureSettingsProto.NavBar.NAV_BAR_KIDS_MODE); SecureSettingsProto.NavBar.NAV_BAR_KIDS_MODE);
p.end(navBar);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.NAVIGATION_MODE, Settings.Secure.NAVIGATION_MODE,