Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Make DreamActivity no history"" into tm-qpr-dev am: dd326938bc am: 4a3044d1d2

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

Change-Id: I8c7c06e514ad83dab31be12280be1470086afb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2023-03-08 20:54:25 +00:00
committed by Automerger Merge Worker
parent 479af59315 4a3044d1d2
commit 69728038a9
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/service/dreams/DreamActivity.java
View File

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

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -1496,7 +1496,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;