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

Commit 5984ded0 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Check DreamActivity callback type to prevent class cast exception" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21938299



Change-Id: I3b9faf4a4a96fe1b406784b71d6f278bf4bdf692
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7894a96b 8daaa631

core/java/android/service/dreams/DreamActivity.java

+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();

        }

    }