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

Commit 3bfa4f25 authored by Galia Peycheva's avatar Galia Peycheva Committed by Android (Google) Code Review
Browse files

Merge "Make DreamActivity no history"

parents b4c2c4f9 becfbaf2

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

        }

    }

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        a.persistableMode = ActivityInfo.PERSIST_NEVER;

        a.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

        a.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;

        a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;

        a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_NO_HISTORY;

        a.resizeMode = RESIZE_MODE_UNRESIZEABLE;

        a.configChanges = 0xffffffff;