Commit 86e9c080 authored by bsheedy's avatar bsheedy Committed by Commit Bot

Add support for and use encrypted shared prefs

Adds support for saving shared preference files to the encrypted data
directory in the instrumentation test runner and VR Telemetry tests and
sets the VR shared preference files to use this new functionality.

Prerequisite Catapult change is at
https://chromium-review.googlesource.com/c/catapult/+/986951.

Bug: 826501
Change-Id: Ie51003fac40536c77b5814076ae67c4a153ed31d
Reviewed-on: https://chromium-review.googlesource.com/986926Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547902}
parent 5d7856ba
...@@ -219,8 +219,9 @@ class LocalDeviceInstrumentationTestRun( ...@@ -219,8 +219,9 @@ class LocalDeviceInstrumentationTestRun(
@trace_event.traced @trace_event.traced
def edit_shared_prefs(dev): def edit_shared_prefs(dev):
for setting in self._test_instance.edit_shared_prefs: for setting in self._test_instance.edit_shared_prefs:
shared_pref = shared_prefs.SharedPrefs(dev, setting['package'], shared_pref = shared_prefs.SharedPrefs(
setting['filename']) dev, setting['package'], setting['filename'],
use_encrypted_path=setting.get('supports_encrypted_path', False))
shared_preference_utils.ApplySharedPreferenceSetting( shared_preference_utils.ApplySharedPreferenceSetting(
shared_pref, setting) shared_pref, setting)
......
...@@ -52,6 +52,7 @@ def ApplySharedPreferenceSetting(shared_pref, setting): ...@@ -52,6 +52,7 @@ def ApplySharedPreferenceSetting(shared_pref, setting):
{ {
"package": "com.example.package", "package": "com.example.package",
"filename": "AppSettingsFile.xml", "filename": "AppSettingsFile.xml",
"supports_encrypted_path": true,
"set": { "set": {
"SomeBoolToSet": true, "SomeBoolToSet": true,
"SomeStringToSet": "StringValue", "SomeStringToSet": "StringValue",
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{ {
"package": "com.google.vr.vrcore", "package": "com.google.vr.vrcore",
"filename": "VrCoreSettings.xml", "filename": "VrCoreSettings.xml",
"supports_encrypted_path": true,
"set": { "set": {
"VrSkipDon": true, "VrSkipDon": true,
"DaydreamSetupComplete": true, "DaydreamSetupComplete": true,
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{ {
"package": "com.google.vr.vrcore", "package": "com.google.vr.vrcore",
"filename": "VrCoreSettings.xml", "filename": "VrCoreSettings.xml",
"supports_encrypted_path": true,
"set": { "set": {
"VrSkipDon": true, "VrSkipDon": true,
"DaydreamSetupComplete": true, "DaydreamSetupComplete": true,
......
...@@ -64,8 +64,9 @@ class SharedAndroidVrPageState(shared_page_state.SharedPageState): ...@@ -64,8 +64,9 @@ class SharedAndroidVrPageState(shared_page_state.SharedPageState):
"""Configures VrCore using the provided settings file.""" """Configures VrCore using the provided settings file."""
settings = shared_preference_utils.ExtractSettingsFromJson(filepath) settings = shared_preference_utils.ExtractSettingsFromJson(filepath)
for setting in settings: for setting in settings:
shared_pref = self._platform.GetSharedPrefs(setting['package'], shared_pref = self._platform.GetSharedPrefs(
setting['filename']) setting['package'], setting['filename'],
use_encrypted_path=setting.get('supports_encrypted_path', False))
shared_preference_utils.ApplySharedPreferenceSetting( shared_preference_utils.ApplySharedPreferenceSetting(
shared_pref, setting) shared_pref, setting)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment