Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd237cbac122cdb48e5b73db5a9c5f8d85ceebe55':
  Prevent crashing when disabling MCU during dream wakeup
This commit is contained in:
Heather Lee Wilson
2014-05-07 00:31:36 +00:00
committed by Android Git Automerger
parent b5342f965b d237cbac12
commit 6827949fc6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -642,8 +642,9 @@ public final class DreamManagerService extends SystemService {
try { try {
synchronized (mMcuHal) { synchronized (mMcuHal) {
if (mReleased) { if (mReleased) {
throw new IllegalStateException("This operation cannot be performed " Slog.w(TAG, "Ignoring message to MCU HAL because the dream "
+ "because the dream has ended."); + "has already ended: " + msg);
return null;
} }
return mMcuHal.sendMessage(msg, arg); return mMcuHal.sendMessage(msg, arg);
} }