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

Commit 5d0a560c authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev

* commit '4a01f2b5':
  delay onDreamingStarted() to work around asynchrony.
parents 1deaf3c7 4a01f2b5
Loading
Loading
Loading
Loading
+12 −7
Original line number Diff line number Diff line
@@ -612,19 +612,24 @@ public class DreamService extends Service implements Window.Callback {
                    View.SYSTEM_UI_FLAG_LOW_PROFILE);
            getWindowManager().addView(mWindow.getDecorView(), mWindow.getAttributes());
        } catch (Throwable t) {
            Slog.w("Crashed adding window view", t);
            Slog.w(TAG, "Crashed adding window view", t);
            safelyFinish();
            return;
        }

        // start it up
        mHandler.post(new Runnable() {
            @Override
            public void run() {
                try {
                    onDreamingStarted();
                } catch (Throwable t) {
            Slog.w("Crashed in onDreamingStarted()", t);
                    Slog.w(TAG, "Crashed in onDreamingStarted()", t);
                    safelyFinish();
                }
            }
        });
    }

    private void safelyFinish() {
        if (mDebug) Slog.v(TAG, "safelyFinish()");