From 1299f13b6cadac457244e8fb585a529ca74f2119 Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Tue, 4 Feb 2020 16:41:34 -0800 Subject: [PATCH] remove unused methods Bug: 147764499 Test: atest com.android.server.pm.ShortcutManagerTest1 \ com.android.server.pm.ShortcutManagerTest2 \ com.android.server.pm.ShortcutManagerTest3 \ com.android.server.pm.ShortcutManagerTest4 \ com.android.server.pm.ShortcutManagerTest5 \ com.android.server.pm.ShortcutManagerTest6 \ com.android.server.pm.ShortcutManagerTest7 \ com.android.server.pm.ShortcutManagerTest8 \ com.android.server.pm.ShortcutManagerTest9 \ com.android.server.pm.ShortcutManagerTest10 Change-Id: Ie70abcc729557787cc06a65abce41f93e7f35dc6 --- .../android/content/pm/IShortcutService.aidl | 6 --- .../android/server/pm/ShortcutService.java | 42 ------------------- 2 files changed, 48 deletions(-) diff --git a/core/java/android/content/pm/IShortcutService.aidl b/core/java/android/content/pm/IShortcutService.aidl index 747e929eda98f..9e85fc301a0c3 100644 --- a/core/java/android/content/pm/IShortcutService.aidl +++ b/core/java/android/content/pm/IShortcutService.aidl @@ -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, diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index f368666a06ba6..348a1fc279f89 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -2149,48 +2149,6 @@ public class ShortcutService extends IShortcutService.Stub { verifyStates(); } - @Override - public ParceledListSlice 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 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 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 getShortcuts(String packageName, @ShortcutManager.ShortcutMatchFlags int matchFlags, @UserIdInt int userId) {