From 3f4f9902cb472057002849e0ecbb6f6d27fe0881 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 16 Nov 2018 15:59:44 +0000 Subject: [PATCH] Remove error that will commonly falsely fire & replace with explicit log --- renderdoc/android/android.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index 035fce147..c8b68ffca 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -192,11 +192,6 @@ 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 @@ -245,6 +240,8 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag int pid = 0; + RDCLOG("Launching package '%s' with activity '%s'", packageName.c_str(), activityName.c_str()); + if(injectLibraries) { RDCLOG("Setting up to launch the application as a debugger to inject.");