From 588642c4c866ea985d3ab3fc8600dfea47ddacf5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 12 Nov 2018 22:24:08 +0000 Subject: [PATCH] Add check for android activity being valid --- renderdoc/android/android.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index 1c9d56d09..7f24454ec 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -192,6 +192,11 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag // adb shell cmd package resolve-activity -c android.intent.category.LAUNCHER com.jake.cube1 string activityName = GetDefaultActivityForPackage(deviceID, packageName); + if(activityName.find(packageName) == std::string::npos) + RDCERR( + "Activity name doesn't contain package name - potential problem, check package has default " + "activity"); + uint16_t jdwpPort = GetJdwpPort(); // remove any previous jdwp port forward on this port