Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d237cbac authored by Heather Lee Wilson's avatar Heather Lee Wilson Committed by Android (Google) Code Review
Browse files

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

parents fe997295 9da8301e

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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);

                }

                }