Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev (5b9d876e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/LauncherApps.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,9 @@ public class LauncherApps {
		}

		/**
		* If non-null, returns only shortcuts associated with the activity.
		* If non-null, returns only shortcuts associated with the activity, which are
		* {@link ShortcutInfo}s that have null {@link ShortcutInfo#getActivityComponent()}, or
		* {@link ShortcutInfo#getActivityComponent()} equals to {@code activity}.
		*/
		public void setActivity(@Nullable ComponentName activity) {
		mActivity = activity;

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -1256,9 +1256,14 @@ public class ShortcutService extends IShortcutService.Stub {
		}

		private void notifyListeners(@NonNull String packageName, @UserIdInt int userId) {
		final long token = injectClearCallingIdentity();
		try {
		if (!mUserManager.isUserRunning(userId)) {
		return;
		}
		} finally {
		injectRestoreCallingIdentity(token);
		}
		postToHandler(() -> {
		final ArrayList<ShortcutChangeListener> copy;
		synchronized (mLock) {
		@@ -1771,10 +1776,12 @@ public class ShortcutService extends IShortcutService.Stub {
		if (ids != null && !ids.contains(si.getId())) {
		return false;
		}
		if (componentName != null
		&& !componentName.equals(si.getActivityComponent())) {
		if (componentName != null) {
		if (si.getActivityComponent() != null
		&& !si.getActivityComponent().equals(componentName)) {
		return false;
		}
		}
		final boolean matchDynamic =
		((queryFlags & ShortcutQuery.FLAG_GET_DYNAMIC) != 0)
		&& si.isDynamic();

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

+52 −10

Original line number	Diff line number	Diff line
		@@ -115,6 +115,8 @@ import com.android.server.pm.ShortcutUser.PackageWithUser;

		import org.junit.Assert;
		import org.mockito.ArgumentCaptor;
		import org.mockito.invocation.InvocationOnMock;
		import org.mockito.stubbing.Answer;

		import java.io.BufferedReader;
		import java.io.ByteArrayOutputStream;
		@@ -583,7 +585,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		}).when(mMockUserManager).getUserInfo(eq(USER_P0));

		// User 0 is always running.
		when(mMockUserManager.isUserRunning(eq(USER_0))).thenReturn(true);
		when(mMockUserManager.isUserRunning(eq(USER_0))).thenAnswer(new AnswerIsUserRunning(true));

		initService();
		setCaller(CALLING_PACKAGE_1);
		@@ -594,6 +596,24 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		mInternal.onSystemLocaleChangedNoLock();
		}

		/**
		* Returns a boolean but also checks if the current UID is SYSTEM_UID.
		*/
		private class AnswerIsUserRunning implements Answer<Boolean> {
		private final boolean mAnswer;

		private AnswerIsUserRunning(boolean answer) {
		mAnswer = answer;
		}

		@Override
		public Boolean answer(InvocationOnMock invocation) throws Throwable {
		assertEquals("isUserRunning() must be called on SYSTEM UID.",
		Process.SYSTEM_UID, mInjectedCallingUid);
		return mAnswer;
		}
		}

		private static UserInfo withProfileGroupId(UserInfo in, int groupId) {
		in.profileGroupId = groupId;
		return in;
		@@ -871,6 +891,18 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		return s;
		}

		/**
		* Make a shortcut with an ID, a timestamp and an activity component
		*/
		private ShortcutInfo makeShortcutWithTimestampWithActivity(String id, long timestamp,
		ComponentName activity) {
		final ShortcutInfo s = makeShortcut(
		id, "Title-" + id, activity, /* icon =*/ null,
		makeIntent(Intent.ACTION_VIEW, ShortcutActivity.class), /* weight =*/ 0);
		s.setTimestamp(timestamp);
		return s;
		}

		/**
		* Make a shortcut with an ID and icon.
		*/
		@@ -2014,8 +2046,10 @@ public class ShortcutManagerTest extends InstrumentationTestCase {

		setCaller(CALLING_PACKAGE_2);
		final ShortcutInfo s2_2 = makeShortcutWithTimestamp("s2", 1500);
		final ShortcutInfo s2_3 = makeShortcutWithTimestamp("s3", 3000);
		final ShortcutInfo s2_4 = makeShortcutWithTimestamp("s4", 500);
		final ShortcutInfo s2_3 = makeShortcutWithTimestampWithActivity("s3", 3000,
		makeComponent(ShortcutActivity2.class));
		final ShortcutInfo s2_4 = makeShortcutWithTimestampWithActivity("s4", 500,
		makeComponent(ShortcutActivity.class));
		assertTrue(mManager.setDynamicShortcuts(list(s2_2, s2_3, s2_4)));

		setCaller(CALLING_PACKAGE_3);
		@@ -2056,6 +2090,15 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		getCallingUser())),
		"s2", "s3"))));

		// Filter by activity
		assertAllDynamic(assertAllHaveTitle(assertAllNotHaveIntents(assertShortcutIds(
		assertAllNotKeyFieldsOnly(mLauncherApps.getShortcuts(buildQuery(
		/* time =*/ 0, CALLING_PACKAGE_2,
		new ComponentName(CALLING_PACKAGE_2, ShortcutActivity.class.getName()),
		ShortcutQuery.FLAG_GET_PINNED \| ShortcutQuery.FLAG_GET_DYNAMIC),
		getCallingUser())),
		"s2", "s4"))));

		// With ID.
		assertAllDynamic(assertAllNotHaveTitle(assertAllNotHaveIntents(assertShortcutIds(
		assertAllKeyFieldsOnly(mLauncherApps.getShortcuts(buildQuery(
		@@ -2115,7 +2158,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		/* activity =/ null, / flags */ 0), getCallingUser());
		});

		// TODO More tests: pinned but dynamic, filter by activity
		// TODO More tests: pinned but dynamic.
		}

		public void testGetShortcutInfo() {
		@@ -3302,9 +3345,8 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		assertCallbackNotReceived(c11_1);

		// Work profile, now running.

		when(mMockUserManager.isUserRunning(anyInt())).thenReturn(false);
		when(mMockUserManager.isUserRunning(eq(USER_P0))).thenReturn(true);
		doAnswer(new AnswerIsUserRunning(false)).when(mMockUserManager).isUserRunning(anyInt());
		doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_P0));

		resetAll(all);
		runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> {
		@@ -3323,8 +3365,8 @@ public class ShortcutManagerTest extends InstrumentationTestCase {

		// Normal secondary user.

		when(mMockUserManager.isUserRunning(anyInt())).thenReturn(false);
		when(mMockUserManager.isUserRunning(eq(USER_10))).thenReturn(true);
		doAnswer(new AnswerIsUserRunning(false)).when(mMockUserManager).isUserRunning(anyInt());
		doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_10));

		resetAll(all);
		runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
		@@ -4377,7 +4419,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase {
		// notification to the launcher.
		mInjectedCurrentTimeLillis = START_TIME + 200;

		when(mMockUserManager.isUserRunning(eq(USER_10))).thenReturn(true);
		doAnswer(new AnswerIsUserRunning(true)).when(mMockUserManager).isUserRunning(eq(USER_10));

		reset(c0);
		reset(c10);