Merge "Revert "Finish HomepageActivity when it's not the root of a task and... (3711945e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/homepage/SettingsHomepageActivity.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -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;

+0 −23

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import static org.mockito.ArgumentMatchers.anyString;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;
		@@ -223,28 +222,6 @@ public class SettingsHomepageActivityTest {
		& SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
		}

		@Test
		public void onCreate_notTaskRoot_shouldFinishActivity() {
		SettingsHomepageActivity activity =
		spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
		doReturn(false).when(activity).isTaskRoot();

		activity.onCreate(/* savedInstanceState */ null);

		verify(activity).finish();
		}

		@Test
		public void onCreate_singleTaskActivity_shouldNotFinishActivity() {
		SettingsHomepageActivity activity =
		spy(Robolectric.buildActivity(DeepLinkHomepageActivity.class).get());
		doReturn(false).when(activity).isTaskRoot();

		activity.onCreate(/* savedInstanceState */ null);

		verify(activity, never()).finish();
		}

		/** This test is for large screen devices Activity embedding. */
		@Test
		@Config(shadows = ShadowActivityEmbeddingUtils.class)