Android 215

A few small fixes

README.md

@@ -1,7 +1,7 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
 | [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12760](https://github.com/yuzu-emu/yuzu-android//pull/12760) | [`eb46f21c5`](https://github.com/yuzu-emu/yuzu-android//pull/12760/files) | am: rewrite for multiprocess support | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12760](https://github.com/yuzu-emu/yuzu-android//pull/12760) | [`2c33ba278`](https://github.com/yuzu-emu/yuzu-android//pull/12760/files) | am: rewrite for multiprocess support | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [12802](https://github.com/yuzu-emu/yuzu-android//pull/12802) | [`c5e88c654`](https://github.com/yuzu-emu/yuzu-android//pull/12802/files) | service: mii: Migrate service to new interface | [german77](https://github.com/german77/) | Yes |
 
 

externals/nx_tzdb/CMakeLists.txt

@@ -32,7 +32,7 @@ set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
 
 set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
 
-if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE})
+if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR})
     set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
 
     message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -11,6 +11,10 @@ execute_process(
     WORKING_DIRECTORY ${ZONE_PATH}
     OUTPUT_VARIABLE FILE_LIST)
 
+if (NOT FILE_LIST)
+    message(FATAL_ERROR "No timezone files found in directory ${ZONE_PATH}, did the download fail?")
+endif()
+
 set(DIRECTORY_NAME ${HEADER_NAME})
 
 set(FILE_DATA "")

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -301,6 +301,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                 R.id.menu_exit -> {
                     emulationState.stop()
+                    NativeConfig.reloadGlobalConfig()
                     emulationViewModel.setIsEmulationStopping(true)
                     binding.drawerLayout.close()
                     binding.inGameMenu.requestFocus()

src/android/app/src/main/jni/native.cpp

@@ -209,6 +209,12 @@ void EmulationSession::InitializeSystem(bool reload) {
     m_system.GetFileSystemController().CreateFactories(*m_vfs);
 }
 
+void EmulationSession::SetAppletId(int applet_id) {
+    m_applet_id = applet_id;
+    m_system.GetFrontendAppletHolder().SetCurrentAppletId(
+        static_cast<Service::AM::AppletId>(m_applet_id));
+}
+
 Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string& filepath) {
     std::scoped_lock lock(m_mutex);
 
@@ -240,7 +246,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
 
     // Load the ROM.
     Service::AM::FrontendAppletParameters params{
-        .applet_id = Service::AM::AppletId::Application,
+        .applet_id = static_cast<Service::AM::AppletId>(m_applet_id),
     };
     m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath, params);
     if (m_load_result != Core::SystemResultStatus::Success) {
@@ -327,6 +333,9 @@ void EmulationSession::RunEmulation() {
             }
         }
     }
+
+    // Reset current applet ID.
+    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
 }
 
 bool EmulationSession::IsHandheldOnly() {
@@ -759,8 +768,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getAppletLaunchPath(JNIEnv* env, j
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCurrentAppletId(JNIEnv* env, jclass clazz,
                                                               jint jappletId) {
-    EmulationSession::GetInstance().System().GetFrontendAppletHolder().SetCurrentAppletId(
-        static_cast<Service::AM::AppletId>(jappletId));
+    EmulationSession::GetInstance().SetAppletId(jappletId);
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz,

src/android/app/src/main/jni/native.h

@@ -45,6 +45,7 @@ public:
     const Core::PerfStatsResults& PerfStats();
     void ConfigureFilesystemProvider(const std::string& filepath);
     void InitializeSystem(bool reload);
+    void SetAppletId(int applet_id);
     Core::SystemResultStatus InitializeEmulation(const std::string& filepath);
 
     bool IsHandheldOnly();
@@ -77,6 +78,7 @@ private:
     std::atomic<bool> m_is_paused = false;
     SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{};
     std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider;
+    int m_applet_id{1};
 
     // GPU driver parameters
     std::shared_ptr<Common::DynamicLibrary> m_vulkan_library;

src/core/hle/service/am/applet_manager.cpp

@@ -221,6 +221,7 @@ void AppletManager::InsertApplet(std::shared_ptr<Applet> applet) {
 
 void AppletManager::TerminateAndRemoveApplet(AppletResourceUserId aruid) {
     std::shared_ptr<Applet> applet;
+    bool should_stop = false;
     {
         std::scoped_lock lk{m_lock};
 
@@ -231,10 +232,17 @@ void AppletManager::TerminateAndRemoveApplet(AppletResourceUserId aruid) {
 
         applet = it->second;
         m_applets.erase(it);
+
+        should_stop = m_applets.empty();
     }
 
     // Terminate process.
     applet->process->Terminate();
+
+    // If there were no applets left, stop emulation.
+    if (should_stop) {
+        m_system.Exit();
+    }
 }
 
 void AppletManager::CreateAndInsertByFrontendAppletParameters(

src/core/hle/service/am/display_controller.cpp

@@ -60,13 +60,12 @@ void IDisplayController::GetCallerAppletCaptureImageEx(HLERequestContext& ctx) {
     LOG_WARNING(Service_AM, "(STUBBED) called");
 
     OutputParameters params{};
-    const auto res = applet->system_buffer_manager.WriteApplicationCaptureBuffer(
+    const auto res = applet->system_buffer_manager.WriteAppletCaptureBuffer(
         &params.was_written, &params.fbshare_layer_index);
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(res);
-    rb.Push(params.was_written);
-    rb.Push(params.fbshare_layer_index);
+    rb.PushRaw(params);
 }
 
 void IDisplayController::TakeScreenShotOfOwnLayer(HLERequestContext& ctx) {
@@ -80,13 +79,12 @@ void IDisplayController::AcquireLastApplicationCaptureSharedBuffer(HLERequestCon
     LOG_WARNING(Service_AM, "(STUBBED) called");
 
     OutputParameters params{};
-    const auto res = applet->system_buffer_manager.WriteApplicationCaptureBuffer(
+    const auto res = applet->system_buffer_manager.WriteAppletCaptureBuffer(
         &params.was_written, &params.fbshare_layer_index);
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(res);
-    rb.Push(params.was_written);
-    rb.Push(params.fbshare_layer_index);
+    rb.PushRaw(params);
 }
 
 void IDisplayController::ReleaseLastApplicationCaptureSharedBuffer(HLERequestContext& ctx) {
@@ -100,13 +98,12 @@ void IDisplayController::AcquireLastForegroundCaptureSharedBuffer(HLERequestCont
     LOG_WARNING(Service_AM, "(STUBBED) called");
 
     OutputParameters params{};
-    const auto res = applet->system_buffer_manager.WriteApplicationCaptureBuffer(
+    const auto res = applet->system_buffer_manager.WriteAppletCaptureBuffer(
         &params.was_written, &params.fbshare_layer_index);
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(res);
-    rb.Push(params.was_written);
-    rb.Push(params.fbshare_layer_index);
+    rb.PushRaw(params);
 }
 
 void IDisplayController::ReleaseLastForegroundCaptureSharedBuffer(HLERequestContext& ctx) {
@@ -120,13 +117,12 @@ void IDisplayController::AcquireCallerAppletCaptureSharedBuffer(HLERequestContex
     LOG_WARNING(Service_AM, "(STUBBED) called");
 
     OutputParameters params{};
-    const auto res = applet->system_buffer_manager.WriteApplicationCaptureBuffer(
+    const auto res = applet->system_buffer_manager.WriteAppletCaptureBuffer(
         &params.was_written, &params.fbshare_layer_index);
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(res);
-    rb.Push(params.was_written);
-    rb.Push(params.fbshare_layer_index);
+    rb.PushRaw(params);
 }
 
 void IDisplayController::ReleaseCallerAppletCaptureSharedBuffer(HLERequestContext& ctx) {

src/core/hle/service/am/library_applet_creator.cpp

@@ -115,15 +115,10 @@ AppletProgramId AppletIdToProgramId(AppletId applet_id) {
     return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
 }
 
-std::shared_ptr<ILibraryAppletAccessor> CreateFrontendApplet(Core::System& system,
-                                                             std::shared_ptr<Applet> caller_applet,
-                                                             AppletId applet_id,
-                                                             LibraryAppletMode mode) {
+[[maybe_unused]] std::shared_ptr<ILibraryAppletAccessor> CreateFrontendApplet(
+    Core::System& system, std::shared_ptr<Applet> caller_applet, AppletId applet_id,
+    LibraryAppletMode mode) {
     const auto program_id = static_cast<u64>(AppletIdToProgramId(applet_id));
-    if (program_id == 0) {
-        // Unknown applet
-        return {};
-    }
 
     auto process = std::make_unique<Process>(system);
     auto applet = std::make_shared<Applet>(system, std::move(process));

src/core/hle/service/am/system_buffer_manager.cpp

@@ -60,8 +60,8 @@ void SystemBufferManager::SetWindowVisibility(bool visible) {
     }
 }
 
-Result SystemBufferManager::WriteApplicationCaptureBuffer(bool* out_was_written,
-                                                          s32* out_fbshare_layer_index) {
+Result SystemBufferManager::WriteAppletCaptureBuffer(bool* out_was_written,
+                                                     s32* out_fbshare_layer_index) {
     // TODO
     R_SUCCEED();
 }

src/core/hle/service/am/system_buffer_manager.h

@@ -37,7 +37,7 @@ public:
 
     void SetWindowVisibility(bool visible);
 
-    Result WriteApplicationCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index);
+    Result WriteAppletCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index);
 
 private:
     Kernel::KProcess* m_process{};

src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp

@@ -137,7 +137,7 @@ void NpadAbstractPropertiesHandler::UpdateAllDeviceProperties() {
     const auto npad_index = NpadIdTypeToIndex(npad_id_type);
     for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
         auto* data = applet_resource_holder->applet_resource->GetAruidData(aruid_index);
-        if (!data->flag.is_assigned) {
+        if (data == nullptr || !data->flag.is_assigned) {
             continue;
         }
         auto& npad_entry = data->shared_memory_format->npad.npad_entry[npad_index];