From 36f761d9b7171a71615cd9a298feb28b297f4c0a Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Tue, 4 Jun 2024 10:03:01 +0800
Subject: [PATCH] Enable downgrading between this and future releases of Emacs

* java/AndroidManifest.xml.in: Fix `versionCode' at 30.

(cherry picked from commit d812e94dde2370869198cc0b2089519be94454ef)
---
 java/AndroidManifest.xml.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index f1047ac41d8..a95b46c3905 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -17,8 +17,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 
-<!-- targetSandboxVersion must be 1.  Otherwise, fascist security
-     restrictions prevent Emacs from making HTTP connections.  -->
+<!-- targetSandboxVersion must be 1, for otherwise fascist security
+     restrictions prevent Emacs from making HTTP connections.
+
+     Futhermore, versionCode should remain constant, rather than increase
+     with each major release, because it is impossible to downgrade an
+     installation with a greater value to an older version of Emacs.  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	  package="org.gnu.emacs"
@@ -27,7 +31,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 	  android:requestLegacyExternalStorage="true"
 	  @ANDROID_SHARED_USER_ID@
 	  @ANDROID_SHARED_USER_NAME@
-	  android:versionCode="@emacs_major_version@"
+	  android:versionCode="30"
 	  android:versionName="@version@">
 
   <!-- Paste in every permission in existence so Emacs can do
@@ -286,9 +290,9 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
       </intent-filter>
     </activity>
 
-    <!-- Android 6 and earlier don't display ``application
-         preferences'' activities in Settings, so display the
-         preferences activity as a launcher icon instead.  -->
+    <!-- Android 6 and earlier don't display ``application preferences''
+         activities in Settings, so display the preferences activity as
+         a launcher icon instead.  -->
 
     <activity android:autoRemoveFromRecents="true"
               android:label="Emacs options"
-- 
2.39.5