Android 213

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) | [`0e9c39c9f`](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) | [`eb46f21c5`](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 |
 
 

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

@@ -301,7 +301,6 @@ 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,12 +209,6 @@ 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);
 
@@ -246,7 +240,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
 
     // Load the ROM.
     Service::AM::FrontendAppletParameters params{
-        .applet_id = static_cast<Service::AM::AppletId>(m_applet_id),
+        .applet_id = Service::AM::AppletId::Application,
     };
     m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath, params);
     if (m_load_result != Core::SystemResultStatus::Success) {
@@ -333,9 +327,6 @@ void EmulationSession::RunEmulation() {
             }
         }
     }
-
-    // Reset current applet ID.
-    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
 }
 
 bool EmulationSession::IsHandheldOnly() {
@@ -768,7 +759,8 @@ 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().SetAppletId(jappletId);
+    EmulationSession::GetInstance().System().GetFrontendAppletHolder().SetCurrentAppletId(
+        static_cast<Service::AM::AppletId>(jappletId));
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz,

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

@@ -45,7 +45,6 @@ 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();
@@ -78,7 +77,6 @@ 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/display_controller.cpp

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

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

@@ -115,10 +115,15 @@ AppletProgramId AppletIdToProgramId(AppletId applet_id) {
     return std::make_shared<ILibraryAppletAccessor>(system, broker, applet);
 }
 
-[[maybe_unused]] std::shared_ptr<ILibraryAppletAccessor> CreateFrontendApplet(
-    Core::System& system, std::shared_ptr<Applet> caller_applet, AppletId applet_id,
-    LibraryAppletMode mode) {
+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::WriteAppletCaptureBuffer(bool* out_was_written,
-                                                     s32* out_fbshare_layer_index) {
+Result SystemBufferManager::WriteApplicationCaptureBuffer(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 WriteAppletCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index);
+    Result WriteApplicationCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index);
 
 private:
     Kernel::KProcess* m_process{};