From 8783d150e8f8c6e1b8962e6cce2b65f10587d49d Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 5 Apr 2021 14:21:32 -0400
Subject: [PATCH] Fix potential OOM when updating shortcuts.

---
 .../java/org/thoughtcrime/securesms/util/ConversationUtil.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
index 3419cd0eea..e74efe1800 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
@@ -135,7 +135,7 @@ public final class ConversationUtil {
   @RequiresApi(CONVERSATION_SUPPORT_VERSION)
   public static int getMaxShortcuts(@NonNull Context context) {
     ShortcutManager shortcutManager  = ServiceUtil.getShortcutManager(context);
-    return shortcutManager.getMaxShortcutCountPerActivity();
+    return Math.min(shortcutManager.getMaxShortcutCountPerActivity(), 150);
   }
 
   /**