summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-07-18 13:13:58 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-07-18 13:13:58 +0200
commitd214b8ecaacda8dd77f73d0258c177cc6edd76f8 (patch)
tree8dd852290ecaa6869a846b5aebb17a1c2f40f4be
parente3797eb92e2af9935c88308791b0030ccea9089f (diff)
parent88d0aaf3e7a31128d9745c59bc325dfbc3578b9e (diff)
downloadmullvadvpn-d214b8ecaacda8dd77f73d0258c177cc6edd76f8.tar.xz
mullvadvpn-d214b8ecaacda8dd77f73d0258c177cc6edd76f8.zip
Merge branch 'port-android-app-2025.6-beta1-to-main'
-rw-r--r--android/CHANGELOG.md6
-rw-r--r--dist-assets/android-version-code.txt2
-rw-r--r--dist-assets/android-version-name.txt2
3 files changed, 7 insertions, 3 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
index a22755a771..9aa2feee91 100644
--- a/android/CHANGELOG.md
+++ b/android/CHANGELOG.md
@@ -22,12 +22,16 @@ Line wrap the file at 100 chars. Th
* **Security**: in case of vulnerabilities.
## [Unreleased]
+
+
+## [android/2025.6-beta1] - 2025-07-17
### Added
- Add Memory Tagging (MTE) opt-in flag to enable it by default on supported Android versions and
devices.
### Changed
-- Use AlarmManager to schedule account out of time notifications.
+- Improve the expiry notification scheduling by switching to use AlarmManager.
+- Update the design of the select location screen.
## [android/2025.5] - 2025-07-02
diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt
index 8bd49264ba..751c25065b 100644
--- a/dist-assets/android-version-code.txt
+++ b/dist-assets/android-version-code.txt
@@ -1 +1 @@
-25059000
+25061001
diff --git a/dist-assets/android-version-name.txt b/dist-assets/android-version-name.txt
index 143056ac48..5125f5e129 100644
--- a/dist-assets/android-version-name.txt
+++ b/dist-assets/android-version-name.txt
@@ -1 +1 @@
-2025.5
+2025.6-beta1