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

am: 0838f2607c Change-Id: I3042ba6345b5b88aa0b95abc8c81dc45ae6be550
2017-09-09 02:08:23 +00:00
parent 4466373ec6 0838f2607c
commit 8660162312
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
@@ -401,7 +401,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();
+            }
        }
    };