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

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

Revert "Make DreamActivity no history" 

This reverts commit f8ebb8da.

Reason for revert: b/271833143 - breaks system dream on tablets

Change-Id: I1dc0c018c170061653fa13ef4121be9758a343b8
parent f8ebb8da

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

+4 −6
Original line number Diff line number Diff line
@@ -58,13 +58,11 @@ public class DreamActivity extends Activity { 
            setTitle(title);

        }



        final Object callback = getIntent().getExtras().getBinder(EXTRA_CALLBACK);

        if (callback instanceof DreamService.DreamActivityCallbacks) {

            mCallback = (DreamService.DreamActivityCallbacks) callback;

        final Bundle extras = getIntent().getExtras();

        mCallback = (DreamService.DreamActivityCallbacks) extras.getBinder(EXTRA_CALLBACK);



        if (mCallback != null) {

            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
@@ -1486,7 +1486,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 | ActivityInfo.FLAG_NO_HISTORY;

        a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;

        a.resizeMode = RESIZE_MODE_UNRESIZEABLE;

        a.configChanges = 0xffffffff;