Merge "Prevent crashing when disabling MCU during dream wakeup" into klp-modular-dev

This commit is contained in:
Heather Lee Wilson
2014-05-07 00:28:08 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}