Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."
This reverts commit 5a305645c1.
Reason for revert: b/325861149
Change-Id: I4441f939a46bf65514756a015355ea5089147c1d
This commit is contained in:
committed by
Android (Google) Code Review
parent
5a305645c1
commit
778bcee157
@@ -183,12 +183,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);
|
||||
@@ -314,12 +308,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;
|
||||
|
||||
Reference in New Issue
Block a user