Revert "Force remove DreamActivity from system server"

This reverts commit d8e0c0d64c.

Test: manual
Bug: 243385408
Fixes: 265999334
Change-Id: I60f697c3091f9bbd490c9cfe6cf79996d0715351
This commit is contained in:
Bryce Lee
2023-01-18 23:46:03 +00:00
parent b796b9e479
commit f904724d26

View File

@@ -16,9 +16,6 @@
package com.android.server.dreams;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;
import android.app.ActivityTaskManager;
import android.app.BroadcastOptions;
import android.content.ComponentName;
import android.content.Context;
@@ -65,7 +62,6 @@ final class DreamController {
private final Context mContext;
private final Handler mHandler;
private final Listener mListener;
private final ActivityTaskManager mActivityTaskManager;
private final Intent mDreamingStartedIntent = new Intent(Intent.ACTION_DREAMING_STARTED)
.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
@@ -93,7 +89,6 @@ final class DreamController {
mContext = context;
mHandler = handler;
mListener = listener;
mActivityTaskManager = mContext.getSystemService(ActivityTaskManager.class);
mCloseNotificationShadeIntent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
mCloseNotificationShadeIntent.putExtra("reason", "dream");
}
@@ -277,9 +272,6 @@ final class DreamController {
mSentStartBroadcast = false;
}
mActivityTaskManager.removeRootTasksWithActivityTypes(
new int[] {ACTIVITY_TYPE_DREAM});
mListener.onDreamStopped(dream.mToken);
}
} finally {