From 9b5ebc9830de58a1a4ce50891200b9076e1e14d3 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 8 Sep 2017 13:45:35 -0700
Subject: [PATCH] Follow-up on bug #65298216: DeviceIdleController needs to...

...watch interactivity, not display state

Fix locking.

Bug: 65298216
Test: manual
Change-Id: If761ce73c82c23295720aea73c3a7fdda40ceedf
---
 .../core/java/com/android/server/DeviceIdleController.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 16f4d04472305..05c75042f0fae 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -403,7 +403,9 @@ public class DeviceIdleController extends SystemService
     private final BroadcastReceiver mInteractivityReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateInteractivityLocked();
+            synchronized (DeviceIdleController.this) {
+                updateInteractivityLocked();
+            }
         }
     };