commit 90372e1f1ce072651d8be15db27d87fe54ec93e6
author Heather Lee Wilson <hwilson@google.com> Wed May 07 13:20:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 07 13:20:08 2014 +0000
tree 42a45df680acd150949cfc0e6116f680cc15025d
parent aeac6d8eb19be578f6e74f203ce1480c95a38f37
parent 6827949fc63699106b7fdc0c399b3fad8e015a79

am 6827949f: am d237cbac: Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev

* commit '6827949fc63699106b7fdc0c399b3fad8e015a79':
  Prevent crashing when disabling MCU during dream wakeup

services/core/java/com/android/server/dreams/DreamManagerService.java

diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java
index fd2f8a1..8968da3 100644
--- a/services/core/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/core/java/com/android/server/dreams/DreamManagerService.java
@@ -642,8 +642,9 @@
             try {
                 synchronized (mMcuHal) {
                     if (mReleased) {
-                        throw new IllegalStateException("This operation cannot be performed "
-                                + "because the dream has ended.");
+                        Slog.w(TAG, "Ignoring message to MCU HAL because the dream "
+                                + "has already ended: " + msg);
+                        return null;
                     }
                     return mMcuHal.sendMessage(msg, arg);
                 }