Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev (61dd3c55) · Commits · e / os / android_frameworks_base

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

+13 −21

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ public class LauncherApps {
		* If the calling launcher application contains pinned shortcuts, they will still work,
		* even though the caller no longer has the shortcut host permission.
		*
		* <p>Returns {@code false} when the user is locked.
		* @throws IllegalStateException when the user is locked.
		*
		* @see ShortcutManager
		*/
		@@ -510,13 +510,12 @@ public class LauncherApps {
		* <p>Callers must be allowed to access the shortcut information, as defined in {@link
		* #hasShortcutHostPermission()}.
		*
		* <p>Returns am empty list when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @param query result includes shortcuts matching this query.
		* @param user The UserHandle of the profile.
		*
		* @return the IDs of {@link ShortcutInfo}s that match the query.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @see ShortcutManager
		*/
		@@ -556,12 +555,11 @@ public class LauncherApps {
		* <p>The calling launcher application must be allowed to access the shortcut information,
		* as defined in {@link #hasShortcutHostPermission()}.
		*
		* <p>Call will be ignored when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @param packageName The target package name.
		* @param shortcutIds The IDs of the shortcut to be pinned.
		* @param user The UserHandle of the profile.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @see ShortcutManager
		*/
		@@ -630,13 +628,12 @@ public class LauncherApps {
		* <p>The calling launcher application must be allowed to access the shortcut information,
		* as defined in {@link #hasShortcutHostPermission()}.
		*
		* <p>Returns {@code null} when the user is locked, or when the user owning the shortcut
		* is locked or not running.
		*
		* @param density The preferred density of the icon, zero for default density. Use
		* density DPI values from {@link DisplayMetrics}.
		*
		* @return The drawable associated with the shortcut.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @see ShortcutManager
		* @see #getShortcutBadgedIconDrawable(ShortcutInfo, int)
		@@ -681,11 +678,10 @@ public class LauncherApps {
		* <p>The calling launcher application must be allowed to access the shortcut information,
		* as defined in {@link #hasShortcutHostPermission()}.
		*
		* <p>Returns {@code 0} when the user is locked, or when the user owning the shortcut
		* is locked or not running.
		*
		* @param density Optional density for the icon, or 0 to use the default density. Use
		* @return A badged icon for the shortcut.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @see ShortcutManager
		* @see #getShortcutIconDrawable(ShortcutInfo, int)
		@@ -704,15 +700,13 @@ public class LauncherApps {
		* <p>The calling launcher application must be allowed to access the shortcut information,
		* as defined in {@link #hasShortcutHostPermission()}.
		*
		* <p>Throws {@link android.content.ActivityNotFoundException}
		* when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @param packageName The target shortcut package name.
		* @param shortcutId The target shortcut ID.
		* @param sourceBounds The Rect containing the source bounds of the clicked icon.
		* @param startActivityOptions Options to pass to startActivity.
		* @param user The UserHandle of the profile.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @throws android.content.ActivityNotFoundException failed to start shortcut. (e.g.
		* the shortcut no longer exists, is disabled, the intent receiver activity doesn't exist, etc)
		@@ -730,13 +724,11 @@ public class LauncherApps {
		* <p>The calling launcher application must be allowed to access the shortcut information,
		* as defined in {@link #hasShortcutHostPermission()}.
		*
		* <p>Throws {@link android.content.ActivityNotFoundException}
		* when the user is locked, or when the user owning the shortcut
		* is locked or not running.
		*
		* @param shortcut The target shortcut.
		* @param sourceBounds The Rect containing the source bounds of the clicked icon.
		* @param startActivityOptions Options to pass to startActivity.
		* @throws IllegalStateException when the user is locked, or when the {@code user} user
		* is locked or not running.
		*
		* @throws android.content.ActivityNotFoundException failed to start shortcut. (e.g.
		* the shortcut no longer exists, is disabled, the intent receiver activity doesn't exist, etc)

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

+38 −33

Original line number	Diff line number	Diff line
		@@ -768,6 +768,7 @@ public class LauncherAppsService extends SystemService {

		private void onShortcutChangedInner(@NonNull String packageName,
		@UserIdInt int userId) {
		try {
		final UserHandle user = UserHandle.of(userId);

		final int n = mListeners.beginBroadcast();
		@@ -803,6 +804,10 @@ public class LauncherAppsService extends SystemService {
		}
		}
		mListeners.finishBroadcast();
		} catch (RuntimeException e) {
		// When the user is locked we get IllegalState, so just catch all.
		Log.w(TAG, e.getMessage(), e);
		}
		}
		}

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

+177 −138

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,20 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
		mContext.injectRestoreCallingIdentity(token);
		}

		@Override
		protected boolean isUserUnlockedL(@UserIdInt int userId) {
		// Note due to a late change, now ShortcutManager doesn't use
		// UserManager.isUserUnlockingOrUnlocked(). But all unit tests are still using it,
		// so we convert here.

		final long token = injectClearCallingIdentity();
		try {
		return mMockUserManager.isUserUnlockingOrUnlocked(userId);
		} finally {
		injectRestoreCallingIdentity(token);
		}
		}

		@Override
		int injectDipToPixel(int dip) {
		return dip;