diff options
| author | 2023-03-28 14:57:27 -0700 | |
|---|---|---|
| committer | 2023-04-06 17:29:34 +0000 | |
| commit | e4457a190d088dcac7241d6113b4fc837d2a9b97 (patch) | |
| tree | 76a54ce20b77ebf5fc276a360d61c7278175c133 /opengl/java | |
| parent | f304ffc940529866ac613b9e131a594a10154e28 (diff) | |
DO NOT MERGE[Wear] CP wear setting keys in a batch.
This CL upstreams wear settings keys from tm-wear-dev branch to the
master branch.
1. Add/update/delete Settings wear keys to match the latest code in
tm-wear-dev branch.
2. Update back up/restore setup.
3. Rebase SettingsProvider version to ensure that version conflict is
resolved. A new version 216 is added and is used to resolve wear
version conflicts. This change should have no effect on other builds
that are already on the master branch.
See go/wear-1pg-settings-key-upstream for detailed design.
Bug: 270226977
Test: flash the build on a watch and manually test
Test: atest SettingsBackupTest
Change-Id: I8ceb4b5b7dc5ee238f1a8d084d2ca74ef12e9fad
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions