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

2017-09-09 01:39:52 +00:00
parent c0e306bf03 9b5ebc9830
commit c558a8c402
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();
+            }
        }
    };