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

Commit 8daaa631 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Check DreamActivity callback type to prevent class cast exception" into tm-qpr-dev

parents 55d247e9 1b33ec13
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -58,11 +58,13 @@ public class DreamActivity extends Activity {
            setTitle(title);
        }

        final Bundle extras = getIntent().getExtras();
        mCallback = (DreamService.DreamActivityCallbacks) extras.getBinder(EXTRA_CALLBACK);

        if (mCallback != null) {
        final Object callback = getIntent().getExtras().getBinder(EXTRA_CALLBACK);
        if (callback instanceof DreamService.DreamActivityCallbacks) {
            mCallback = (DreamService.DreamActivityCallbacks) callback;
            mCallback.onActivityCreated(this);
        } else {
            mCallback = null;
            finishAndRemoveTask();
        }
    }