Commit: 283159d157371d21d1296acd7c2ea66c16fe4a8e - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 283159d157371d21d1296acd7c2ea66c16fe4a8e (tree)
• Time: 2017-12-17 21:25:08
• Author: Michael W <baddaemon87@gmai...>
• Commiter: Michael W

Log Message

SystemUI: KeyGuardMonitor: Prevent ConcurrentModificationException

* Instead of accessing the original ArrayList, which might be modified

while processing the loop, create a copy of the list and work with that
one

* This ensures that no exception is thrown when some other part unregisters

its listener while the list is already being processed

BUGBASH-1289

Change-Id: Ie8404d88c7c87c4ec8fcd64fdd5218b25806f24f

Change Summary

• modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java

Incremental Difference

--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +128,8 @@ public final class KeyguardMonitor extends KeyguardUpdateMonitorCallback {
     }
 
     private void notifyKeyguardChanged() {
-        for (Callback callback : mCallbacks) {
+        ArrayList<Callback> callbacks = new ArrayList<Callback>(mCallbacks);
+        for (Callback callback : callbacks) {
             callback.onKeyguardChanged();
         }
     }