From 26e77ceb661307a44877eebf790b185d79208d71 Mon Sep 17 00:00:00 2001
From: Daniel Micay <daniel.micay@grapheneos.org>
Date: Sat, 6 Jul 2024 21:20:38 -0400
Subject: [PATCH] better 32-bit deprecation warning

---
 core/res/res/values/strings.xml                                 | 2 ++
 core/res/res/values/symbols.xml                                 | 1 +
 .../core/java/com/android/server/wm/DeprecatedAbiDialog.java    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index d12d90be735c..eafeeaf66277 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -6471,4 +6471,6 @@ ul.</string>
 
     <!-- Button that opens the screen with details of an application error -->
     <string name="aerr_show_details">Show details</string>
+
+    <string name="deprecated_abi_message_grapheneos">This app only supports 32-bit and therefore isn\'t compatible with more recent devices. If the app is still developed, switch to a build for modern devices. GrapheneOS plans to phase out 32-bit app support on older devices for improved security.</string>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index bfc13ef64dcb..f35190b47992 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3262,6 +3262,7 @@
   <java-symbol type="string" name="deprecated_target_sdk_app_store" />
 
   <java-symbol type="string" name="deprecated_abi_message" />
+  <java-symbol type="string" name="deprecated_abi_message_grapheneos" />
 
   <!-- New SMS notification while phone is locked. -->
   <java-symbol type="string" name="new_sms_notification_title" />
diff --git a/services/core/java/com/android/server/wm/DeprecatedAbiDialog.java b/services/core/java/com/android/server/wm/DeprecatedAbiDialog.java
index e96208d3d0b3..c097b8f8a493 100644
--- a/services/core/java/com/android/server/wm/DeprecatedAbiDialog.java
+++ b/services/core/java/com/android/server/wm/DeprecatedAbiDialog.java
@@ -36,7 +36,7 @@ class DeprecatedAbiDialog extends AppWarnings.BaseDialog {
                 PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
                 PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE
                         | PackageItemInfo.SAFE_LABEL_FLAG_TRIM);
-        final CharSequence message = context.getString(R.string.deprecated_abi_message);
+        final CharSequence message = context.getString(R.string.deprecated_abi_message_grapheneos);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(context)
                 .setPositiveButton(R.string.ok, (dialog, which) ->