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

Merge "Restart or finish HomepageActivity when it's launched unexpectedly" into main

Browse Source
This commit is contained in:
Jason Chiu
2024-04-17 01:37:23 +00:00
committed by Android (Google) Code Review
parent d1894bd823 b0c011e077
commit fd8c705af9
2 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,8 +194,12 @@ public class SettingsHomepageActivity extends FragmentActivity implements
if (unprovisioned) {
Log.e(TAG, "Device is not provisioned, exiting Settings");
finish();
return;
}
// Settings homepage should be the task root, otherwise there will be UI issues.
boolean isTaskRoot = isTaskRoot();
mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
if (mIsEmbeddingActivityEnabled) {
final UserManager um = getSystemService(UserManager.class);
@@ -211,13 +215,34 @@ public class SettingsHomepageActivity extends FragmentActivity implements
} else {
intent.setPackage(getPackageName());
}
intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (!isTaskRoot) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
} else {
intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
startActivityAsUser(intent, um.getProfileParent(userInfo.id).getUserHandle());
finish();
return;
}
}
if (!isTaskRoot) {
if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
Log.i(TAG, "Activity has been started, finishing");
} else {
Log.i(TAG, "Homepage should be started with FLAG_ACTIVITY_NEW_TASK, restarting");
Intent intent = new Intent(getIntent())
.setPackage(getPackageName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.putExtra(EXTRA_USER_HANDLE, getUser())
.putExtra(EXTRA_INITIAL_REFERRER, getCurrentReferrer());
startActivity(intent);
}
finish();
return;
}
setupEdgeToEdge();
setContentView(R.layout.settings_homepage_container);