commit | 9b5ebc9830de58a1a4ce50891200b9076e1e14d3 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Sep 08 13:45:35 2017 -0700 |
committer | Dianne Hackborn <hackbod@google.com> | Fri Sep 08 13:45:35 2017 -0700 |
tree | a8536ba736144f57a1ac1362b3b75a9e3a880bfc | |
parent | b913a1e618d3606739ebe9c13a5773b27464c78b [diff] |
Follow-up on bug #65298216: DeviceIdleController needs to... ...watch interactivity, not display state Fix locking. Bug: 65298216 Test: manual Change-Id: If761ce73c82c23295720aea73c3a7fdda40ceedf
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(); + } } };