Update to latest catapult (625dca847)

git log --oneline --no-merges eae13a4..625dca847 tracing systrace

625dca847 Handle perfetto protobuf files
00755b36f V8 GC metrics: Split of foreground, background, and total time
38b827049 Add support for metric abbreviation for physics units.
c6a85907f Telemetry: migrate the rest of smoothness metrics
df56c1dae Telemetry: detect telemetry target renderers
0339f0866 [tracing] Do not skip over entries when importing histograms
b145370ba [CpuFCP] Support CPU time FCP
6292d2f5e androidStartupMetric: ignore the 2nd run
623a134fb Reland Migrate trace_viewer.gypi to gni
b026043a4 Import perfetto json traces
4bcf107ea Add units for Ampers, Volts, Hertz, bytes per second
1922eb00b Update trace categories to reflect new trace names.
547a6910a Updating user timing argument regex to not parse on subsequent ':' chars.
a10f776b1 [results.html] Speed up <histogram-json> parsing
2d4733846 V8 GC metrics: Add GC cycle time
519565187 Revert "Migrate trace_viewer.gypi to gni"
fd3370d4a aura: filter out frames not submitted from browser
30824c537 Migrate trace_viewer.gypi to gni
b273e0cd2 Add aggregate graphs to visualization tool.
e302dcb5a event_finder_util: skip renderer events when no mainThread
b8ae746e2 Telemetry: fix a bug in percentage_smooth
c2f72b8a9 Fix top level scheduler task title
22c3e6c8f Telemetry: process all rendering pipeline events
6190da59c rendering: Generate metrics at the 95%ile.
1dc9e0a00 androidStartupMetric: re-introduce First Contentful Paint
0c42948b7 Clean up categories to match current tracing in Blink.
0480f8cae Telemetry: migrate frame_times & percentage_smooth
cc7dfbec4 [tracing] Restore the minimum mutator utilization metric.
86bdcbf37 androidStartupMetric: slow fallback for incorrect process names
e28148f1c Ignore forced Blink GCs in metrics
9ec8468cf Implementing firstContfulPaint metric using navigationId when present.
56216d783 Telemetry: pixel approximated/checkerboarded
a7a24422d Telemetry: fix thread_other_cpu_time_per_frame_tbmv2
4c28d39fe Add more system stats to the UI tracing view
929a7f4eb Telemetry: clean up legacy surface flinger metrics
bfe2c0046 androidStartupMetric: skip the first start
59297c6f7 Tracing: add java_base* executable memory metrics.
95ed233ed tracing: Avoid rAF callbacks when hidden.
2ba11d1c2 [Dashboard] Key histogram uploads by revision timestamp if necessary
5d1bdd129 trace-viewer: Add a close-button to hide a process.
97534cbfe Dashboard - Add a diagnostic for the build url.
9ba3159e0 tracing: Fix Blink metrics and add unified GC total sum
69f64b270 Allow bindId for separate begin/end slices as well
a0faa9d4d Telemetry: cpu_per_frame metrics in TBMv2
7a4e890f2 Re-enable symbolize_trace_end_to_end_test_slow.SymbolizeTraceEndToEndTest.testMacv2
3cf15a9b4 Fix links in tracing/docs/
8498332d3 trace-viewer: Fix crash in timeline process filter.
7931f7f4a Disable symbolize_trace_end_to_end_test_slow.SymbolizeTraceEndToEndTest.testMacv2
c51eb628d Telemetry: UI frame time metrics in TBMv2
cfc8160ac Telemetry: surface flinger metrics in TBMv2
64f2ed4bb Revert "Use vpython and remove vendored pymock."
23c67a511 Use vpython and remove vendored pymock.
5e9714532 trace-viewer: Allow filtering processes.
582a06eb7 Telemetry: don't fail when SF cannot find win name
b7ae965a6 results2.html debounce search
d282eec79 Fixing frames in animations following response.
deef6ea33 androidStartupMetric: remove the FCP
356cb8473 rendering: Remove some redundant mean_ metrics.
703fd41ed rendering: Remove discrepancy metrics.
758dedc2a Telemetry: Fix SF events
cc38544e3 androidStartupMetric: remove request_start_time from comments
945f73d77 VR: Restore metrics after refactoring
62c9dfc97 rendering: Ignore trace-events for canceled draws.
67653ff0e androidStartupMetric: Remove request_start_time
134ee3695 Allow cswitch version 4 as well as 2
916e932a9 Reland "[TBMv2] Support Chromium commit positions in legacy_json_converter"
6333b6741 Revert "[TBMv2] Support Chromium commit positions in legacy_json_converter"
f633aa104 [TBMv2] Support Chromium commit positions in legacy_json_converter
66b08ec93 Display cswitch header version on errors
0c8cc6141 Fix a bug in console error metric.
106d366ce Add a metric that tracks the number of console error messages
0349b720c [Tracing] Add support for Optimize-Background bucket to V8's runtime call stats table
658e07ae3 Fix systrace/bin/OWNERS.
86b118ed9 Telemetry: first_gesture_scroll_update_latency
5167fb3f6 Telemetry: latency metrics in TBMv2
e0a3ea946 Tracing: Fix an input latency bug
18259e73a Update memory metric for the upcoming V8 memory dump provider changes.
b6bda5336 rendering: Fix for null browser thread.
19aaaf25f [TBMv2] Add legacy JSON converter
7a1ed44d2 Telemetry: fix a rendering benchmark failure
4679c5508 [Tracing] Fix Pylint errors
d55ab227c Fix search bug in metrics visualization tool
8eb323fab Telemetry: pixel metrics in TBMv2
68c00fdca Telemetry: rename metrics as per crbug.com/627461
b791754c7 Telemetry: break rendering_metric.html
f62079a0f Telemetry: queueing_durations in TBMv2
ccd130b9a Add windows performance counters processing.
11877aab1 Make small fixes to metrics visualization tool
615ae9b6f Add tool for visualizing metrics times
58bf2845e Telemetry: fix Gesture IRs
fe6031638 Fix propertyMode in ic_stats_entry
d38bbdff0 rendering: Fix filtering events.

Bug: 117587646
Test: ./systrace.py
Change-Id: Iffd7f590796b07df49ed4fdfd8bc0f695ab9225f

1 files changed, 8 insertions, 3 deletions

diff --git a/catapult/devil/devil/android/sdk/shared_prefs.py b/catapult/devil/devil/android/sdk/shared_prefs.py
index c985cacc..c8c82b4e 100644
--- a/catapult/devil/devil/android/sdk/shared_prefs.py
+++ b/catapult/devil/devil/android/sdk/shared_prefs.py
@@ -278,12 +278,17 @@ class SharedPrefs(object):
       self._xml = None
       self._changed = True
 
-  def Commit(self):
+  def Commit(self, force_commit=False):
     """Save the current set of preferences to the device.
 
-    Only actually saves if some preferences have been modified.
+    Only actually saves if some preferences have been modified or force_commit
+    is set to True.
+
+    Args:
+      force_commit: Commit even if no changes have been made to the SharedPrefs
+        instance.
     """
-    if not self.changed:
+    if not (self.changed or force_commit):
       return
     self._device.RunShellCommand(
         ['mkdir', '-p', posixpath.dirname(self.path)],