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

am: c558a8c402 Change-Id: I0c68639d432760ef4f3d8125e9d39789fd4fc613
2017-09-09 01:47:24 +00:00
parent 2da5f3f027 c558a8c402
commit 0838f2607c
1 changed files with 3 additions and 1 deletions
--- 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();
+            }
        }
    };