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

Commit 4a3044d1 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Revert "Make DreamActivity no history"" into tm-qpr-dev am: dd326938 

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



Change-Id: I1b533866d85edd172ca0de084e659b6d5a6a5c21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09d4c2aa dd326938

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;