commit c558a8c402e250c779d67d00ca75bc98dae1ae96
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 09 01:39:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 09 01:39:52 2017 +0000
tree 45f09d5397b627fa05f338f1f89529aab1e3e4c2
parent c0e306bf032fb62a1dcddb85fd6f1aa3c90ada8f
parent 9b5ebc9830de58a1a4ce50891200b9076e1e14d3

Merge "Follow-up on bug #65298216: DeviceIdleController needs to..." into oc-mr1-dev

services/core/java/com/android/server/DeviceIdleController.java

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