commit 74debf2c77fa42654b2abe4c9844a6a7d34c5e2f
author Serik Beketayev <serikb@google.com> Thu Oct 04 12:18:09 2018 -0700
committer Serik Beketayev <serikb@google.com> Fri Oct 26 06:23:40 2018 +0000
tree 35a3716066f13e2906089e36c0dab6383d42576d
parent 478d84aaf722cadf1e62e0f44ab65457b42301a7

[OWL] Display brightness is now persists over reboots per user

* Fixed CarPowerManagementServiceTests
* Fighting flakines in VmsHalServiceSubscriptionEventTest

Test: Manual
Bug: 116809256
Bug: 117295041
Change-Id: Idf9a04b5d2cb82d52255642d54ed8fcee7766828
(cherry picked from commit 5645793ae301fa2b7491dae053238ad9b8a97c43)

service/src/com/android/car/ICarImpl.java

diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index b63b338..2081148 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -92,8 +92,8 @@
 
     private static final String TAG = "ICarImpl";
     private static final String VHAL_TIMING_TAG = "VehicleHalTiming";
-    private static final TimingsTraceLog mBootTiming = new TimingsTraceLog(VHAL_TIMING_TAG,
-            Trace.TRACE_TAG_HAL);
+
+    private TimingsTraceLog mBootTiming;
 
     /** Test only service. Populate it only when necessary. */
     @GuardedBy("this")
@@ -176,6 +176,7 @@
 
     @MainThread
     void init() {
+        mBootTiming = new TimingsTraceLog(VHAL_TIMING_TAG, Trace.TRACE_TAG_HAL);
         traceBegin("VehicleHal.init");
         mHal.init();
         traceEnd();
@@ -410,13 +411,13 @@
     }
 
     @MainThread
-    private static void traceBegin(String name) {
+    private void traceBegin(String name) {
         Slog.i(TAG, name);
         mBootTiming.traceBegin(name);
     }
 
     @MainThread
-    private static void traceEnd() {
+    private void traceEnd() {
         mBootTiming.traceEnd();
     }