PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."" into main

Browse Source
This commit is contained in:
Chris Antol
2024-02-28 23:20:13 +00:00
committed by Android (Google) Code Review
parent d1b7f58e9a 778bcee157
commit 3711945eb2
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -187,12 +187,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!isTaskRoot() && !isSingleTask()) {
Log.i(TAG, "Not task root nor single task, finish");
finish();
return;
}
mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
if (mIsEmbeddingActivityEnabled) {
final UserManager um = getSystemService(UserManager.class);
@@ -319,12 +313,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
updateHomepageUI();
}
private boolean isSingleTask() {
ActivityInfo info = getIntent().resolveActivityInfo(getPackageManager(),
PackageManager.MATCH_DEFAULT_ONLY);
return info.launchMode == ActivityInfo.LAUNCH_SINGLE_TASK;
}
private void updateSplitLayout() {
if (!mIsEmbeddingActivityEnabled) {
return;