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

Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 am: 36dc648ca5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: If9497561d0efa2311a18886105a1ce02709373be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chiu
2023-12-26 09:18:32 +00:00
committed by Automerger Merge Worker
parent 1dec72e3ab 36dc648ca5
commit 2a29d67710
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,6 +175,12 @@ 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);
@@ -291,6 +297,12 @@ public class SettingsHomepageActivity extends FragmentActivity implements
updateSplitLayout();
}
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;