commit bb766995f3eed76e406bab9a2b78bbbcc3edafc8
author Hall Liu <hallliu@google.com> Wed Mar 10 23:16:58 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 10 23:16:58 2021 +0000
tree cad83c809548a3314dc479ed6f4eb3567252d416
parent 3c5eace852d760abcab7bf003f8830fefe30068b
parent edf37479c9a34aa719e6c59847242ed815b25eff

Merge "Fix race+logging issue in SystemStateHelper" into sc-dev

src/com/android/server/telecom/SystemStateHelper.java

diff --git a/src/com/android/server/telecom/SystemStateHelper.java b/src/com/android/server/telecom/SystemStateHelper.java
index 0c14d5e..f78d21c 100644
--- a/src/com/android/server/telecom/SystemStateHelper.java
+++ b/src/com/android/server/telecom/SystemStateHelper.java
@@ -75,7 +75,7 @@
     private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            Log.startSession("SSP.oR");
+            Log.startSession("SSH.oR");
             try {
                 synchronized (mLock) {
                     String action = intent.getAction();
@@ -120,11 +120,19 @@
     @Override
     public void onProjectionStateChanged(int activeProjectionTypes,
             @NonNull Set<String> projectingPackages) {
-        if (projectingPackages.isEmpty()) {
-            onReleaseAutomotiveProjection();
-        } else {
-            onSetAutomotiveProjection(projectingPackages.iterator().next());
+        Log.startSession("SSH.oPSC");
+        try {
+            synchronized (mLock) {
+                if (projectingPackages.isEmpty()) {
+                    onReleaseAutomotiveProjection();
+                } else {
+                    onSetAutomotiveProjection(projectingPackages.iterator().next());
+                }
+            }
+        } finally {
+            Log.endSession();
         }
+
     }
 
     private Set<SystemStateListener> mListeners = new CopyOnWriteArraySet<>();