Android #4

Merge pull request #11067 from t895/fragile-data
android: Don't prompt to save user data on uninstall
2023-07-10 00:59:47 +00:00 · 2023-07-09 17:20:14 -07:00 · 2023-07-09 19:27:52 -04:00 · 2023-07-09 19:27:41 -04:00 · 2023-07-09 19:02:42 -04:00 · 2023-07-09 16:24:49 -04:00
5 changed files with 11 additions and 4 deletions
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@ -56,7 +56,6 @@ for i in package/*.exe; do
  x86_64-w64-mingw32-strip "${i}"
 done

-pip3 install pefile
 python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/"

 # copy FFmpeg libraries
--- a/README.md
+++ b/README.md
@ -1,3 +1,11 @@
+| Pull Request | Commit | Title | Author | Merged? |
+|----|----|----|----|----|
+
+
+End of merge log. You can find the original README.md below the break.
+
+-----
+
 <!--
 SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@ -22,7 +22,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
        android:label="@string/app_name_suffixed"
        android:icon="@drawable/ic_launcher"
        android:allowBackup="true"
-        android:hasFragileUserData="true"
+        android:hasFragileUserData="false"
        android:supportsRtl="true"
        android:isGame="true"
        android:localeConfig="@xml/locales_config"
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@ -27,8 +27,8 @@ std::string GetTimeZoneString() {
    std::string location_name;
    if (time_zone_index == 0) { // Auto
 #if __cpp_lib_chrono >= 201907L
-        const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb();
        try {
+            const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb();
            const std::chrono::time_zone* current_zone = time_zone_data.current_zone();
            std::string_view current_zone_name = current_zone->name();
            location_name = current_zone_name;
--- a/src/core/arm/arm_interface.cpp
+++ b/src/core/arm/arm_interface.cpp
@ -185,7 +185,7 @@ void ARM_Interface::Run() {
        // Notify the debugger and go to sleep if a breakpoint was hit,
        // or if the thread is unable to continue for any reason.
        if (True(hr & HaltReason::InstructionBreakpoint) || True(hr & HaltReason::PrefetchAbort)) {
-            if (!True(hr & HaltReason::InstructionBreakpoint)) {
+            if (!True(hr & HaltReason::PrefetchAbort)) {
                RewindBreakpointInstruction();
            }
            if (system.DebuggerEnabled()) {
Author	SHA1	Message	Date
yuzubot	5a3f561214	Android #4	2023-07-10 00:59:47 +00:00
bunnei	e32ce6cc69	Merge pull request #11067 from t895/fragile-data android: Don't prompt to save user data on uninstall	2023-07-09 17:20:14 -07:00
Morph	190748546d	Merge pull request #11064 from lat9nq/mingw-no-install-pefile ci/mingw: Remove pefile installation step	2023-07-09 19:27:52 -04:00
Morph	79e289404b	Merge pull request #11055 from lat9nq/tzdb-catch- settings: Catch runtime error from STL	2023-07-09 19:27:41 -04:00
Charles Lombardo	a6e467cd55	android: Don't prompt to save user data on uninstall While this can be convenient in some scenarios, this will be a big problem for users trying to sideload different APK versions. If they forget the last one they had installed, they could have problems installing a new copy.	2023-07-09 19:02:42 -04:00
Morph	8a87a41f2d	Merge pull request #11063 from liamwhite/oops arm_interface: correct breakpoint rewind condition	2023-07-09 16:24:49 -04:00
lat9nq	f02226283e	ci/mingw: Remove pefile installation step This is unnecessary here: pefile is already installed on the container. This step also causes issues in coming changes to the container.	2023-07-09 16:07:43 -04:00
Liam	82568412f6	arm_interface: correct breakpoint rewind condition	2023-07-09 12:03:25 -04:00
lat9nq	1255196731	settings: Catch runtime error from STL This function throws a runtime error we can catch on old Windows 10 installs, so we can catch it here rather than disable this path for everybody.	2023-07-09 02:26:58 -04:00
Morph	9ce5d39829	Merge pull request #11030 from lat9nq/tz-restrict-msvc settings: Disable C++20 time zone path on MSVC	2023-07-09 01:45:00 -04:00
lat9nq	302a735135	settings: Disable C++20 path on MSVC Even though it compiles and runs fine on the latest Windows versions, older LTSC builds will crash due to lacking support somewhere in the OS. For now just disable it for MSVC until either Microsoft fixes this or we no longer support 1809 LTSC.	2023-07-05 15:58:12 -04:00