summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeather Lee Wilson <hwilson@google.com>2014-05-05 14:22:50 -0700
committerHeather Lee Wilson <hwilson@google.com>2014-05-06 15:31:57 -0700
commit9da8301e0abbc940b28a524e36e83f04884ce4cb (patch)
tree0321e2a73efdf8a897877dad8b051ff6d365b51a
parent84aaf124b762b9eeb0957aaea9df8424a429b148 (diff)
downloadframeworks_base-9da8301e0abbc940b28a524e36e83f04884ce4cb.zip
frameworks_base-9da8301e0abbc940b28a524e36e83f04884ce4cb.tar.gz
frameworks_base-9da8301e0abbc940b28a524e36e83f04884ce4cb.tar.bz2
Prevent crashing when disabling MCU during dream wakeup
AmbientMode attempting to send message to DozeHardware no longer results in an uncaught IllegalStateException. The exception was crashing Android Wear when DozeHardware had already been released by PowerManagementService at time of AmbientMode's message. Change-Id: I5956a453802b5b764e88638f6b6d899cbc94cc8d
-rw-r--r--services/core/java/com/android/server/dreams/DreamManagerService.java5
1 files changed, 3 insertions, 2 deletions
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 @@ public final class DreamManagerService extends SystemService {
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);
}