Merge "remove unused methods" (808fd231) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IShortcutService.aidl

+0 −6

Original line number	Diff line number	Diff line
		@@ -29,10 +29,6 @@ interface IShortcutService {
		boolean setDynamicShortcuts(String packageName, in ParceledListSlice shortcutInfoList,
		int userId);

		ParceledListSlice getDynamicShortcuts(String packageName, int userId);

		ParceledListSlice getManifestShortcuts(String packageName, int userId);

		boolean addDynamicShortcuts(String packageName, in ParceledListSlice shortcutInfoList,
		int userId);

		@@ -40,8 +36,6 @@ interface IShortcutService {

		void removeAllDynamicShortcuts(String packageName, int userId);

		ParceledListSlice getPinnedShortcuts(String packageName, int userId);

		boolean updateShortcuts(String packageName, in ParceledListSlice shortcuts, int userId);

		boolean requestPinShortcut(String packageName, in ShortcutInfo shortcut,

+0 −42

Original line number	Diff line number	Diff line
		@@ -2154,48 +2154,6 @@ public class ShortcutService extends IShortcutService.Stub {
		verifyStates();
		}

		@Override
		public ParceledListSlice<ShortcutInfo> getDynamicShortcuts(String packageName,
		@UserIdInt int userId) {
		verifyCaller(packageName, userId);

		synchronized (mLock) {
		throwIfUserLockedL(userId);

		return getShortcutsWithQueryLocked(
		packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
		ShortcutInfo::isDynamicVisible);
		}
		}

		@Override
		public ParceledListSlice<ShortcutInfo> getManifestShortcuts(String packageName,
		@UserIdInt int userId) {
		verifyCaller(packageName, userId);

		synchronized (mLock) {
		throwIfUserLockedL(userId);

		return getShortcutsWithQueryLocked(
		packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
		ShortcutInfo::isManifestVisible);
		}
		}

		@Override
		public ParceledListSlice<ShortcutInfo> getPinnedShortcuts(String packageName,
		@UserIdInt int userId) {
		verifyCaller(packageName, userId);

		synchronized (mLock) {
		throwIfUserLockedL(userId);

		return getShortcutsWithQueryLocked(
		packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR,
		ShortcutInfo::isPinnedVisible);
		}
		}

		@Override
		public ParceledListSlice<ShortcutInfo> getShortcuts(String packageName,
		@ShortcutManager.ShortcutMatchFlags int matchFlags, @UserIdInt int userId) {