Merge "Move more installd methods to Binder."
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 13f558e..500af0c 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -238,10 +238,19 @@
private static List<ResolveInfo> EMPTY_RESOLVE_INFO = new ArrayList<>(0);
- private static Predicate<ResolveInfo> ACTIVITY_NOT_EXPORTED =
- ri -> !ri.activityInfo.exported;
+ // Temporarily reverted to anonymous inner class form due to: b/32554459
+ private static Predicate<ResolveInfo> ACTIVITY_NOT_EXPORTED = new Predicate<ResolveInfo>() {
+ public boolean test(ResolveInfo ri) {
+ return !ri.activityInfo.exported;
+ }
+ };
- private static Predicate<PackageInfo> PACKAGE_NOT_INSTALLED = pi -> !isInstalled(pi);
+ // Temporarily reverted to anonymous inner class form due to: b/32554459
+ private static Predicate<PackageInfo> PACKAGE_NOT_INSTALLED = new Predicate<PackageInfo>() {
+ public boolean test(PackageInfo pi) {
+ return !isInstalled(pi);
+ }
+ };
private final Handler mHandler;