Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp (ba838fd7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/LauncherAppsService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -459,7 +459,7 @@ public class LauncherAppsService extends SystemService {
		}
		// Note the target activity doesn't have to be exported.

		intents[0].setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		intents[0].addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		intents[0].setSourceBounds(sourceBounds);

		return startShortcutIntentsAsPublisher(

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java

+31 −12

Original line number	Diff line number	Diff line
		@@ -2614,8 +2614,10 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		"Title 1",
		makeComponent(ShortcutActivity.class),
		/* icon =*/ null,
		makeIntent(Intent.ACTION_ASSIST, ShortcutActivity2.class,
		"key1", "val1", "nest", makeBundle("key", 123)),
		new Intent[] {makeIntent(Intent.ACTION_ASSIST, ShortcutActivity2.class,
		"key1", "val1", "nest", makeBundle("key", 123))
		.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK),
		new Intent("act2").setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)},
		/* rank */ 10);

		final ShortcutInfo s1_2 = makeShortcut(
		@@ -2658,10 +2660,19 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});

		runWithCaller(LAUNCHER_1, USER_0, () -> {
		assertEquals(
		ShortcutActivity2.class.getName(),
		launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s1", USER_0)
		.getComponent().getClassName());
		final Intent[] intents = launchShortcutAndGetIntents(CALLING_PACKAGE_1, "s1", USER_0);
		assertEquals(ShortcutActivity2.class.getName(),
		intents[0].getComponent().getClassName());
		assertEquals(Intent.ACTION_ASSIST,
		intents[0].getAction());
		assertEquals(Intent.FLAG_ACTIVITY_CLEAR_TASK \| Intent.FLAG_ACTIVITY_NEW_TASK,
		intents[0].getFlags());

		assertEquals("act2",
		intents[1].getAction());
		assertEquals(Intent.FLAG_ACTIVITY_NO_ANIMATION,
		intents[1].getFlags());

		assertEquals(
		ShortcutActivity3.class.getName(),
		launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s2", USER_0)
		@@ -2682,10 +2693,18 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {

		runWithCaller(LAUNCHER_1, USER_0, () -> {
		// Not the default launcher, but pinned shortcuts are still lauchable.
		assertEquals(
		ShortcutActivity2.class.getName(),
		launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s1", USER_0)
		.getComponent().getClassName());
		final Intent[] intents = launchShortcutAndGetIntents(CALLING_PACKAGE_1, "s1", USER_0);
		assertEquals(ShortcutActivity2.class.getName(),
		intents[0].getComponent().getClassName());
		assertEquals(Intent.ACTION_ASSIST,
		intents[0].getAction());
		assertEquals(Intent.FLAG_ACTIVITY_CLEAR_TASK \| Intent.FLAG_ACTIVITY_NEW_TASK,
		intents[0].getFlags());

		assertEquals("act2",
		intents[1].getAction());
		assertEquals(Intent.FLAG_ACTIVITY_NO_ANIMATION,
		intents[1].getFlags());
		assertEquals(
		ShortcutActivity3.class.getName(),
		launchShortcutAndGetIntent(CALLING_PACKAGE_1, "s2", USER_0)