From a3af488927084df0d57e73caea2d5d5c13cce8f1 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 23 Oct 2019 17:09:26 +0100
Subject: [PATCH] Don't recursively call IsSupported from GetFriendlyName (and
 vice-versa)

---
 renderdoc/android/android.cpp       | 2 ++
 renderdoc/android/android_utils.cpp | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp
index 3c5929e49..18fa8f786 100644
--- a/renderdoc/android/android.cpp
+++ b/renderdoc/android/android.cpp
@@ -762,6 +762,8 @@ struct AndroidController : public IDeviceProtocolHandler
         Device dev;
         dev.active = true;
         dev.name = Android::GetFriendlyName(d);
+        if(!Android::IsSupported(d))
+          dev.name += " - (Android 5.x)";
         dev.portbase =
             uint16_t(RenderDoc_ForwardPortBase +
                      RenderDoc::Inst().GetForwardedPortSlot() * RenderDoc_ForwardPortStride);
diff --git a/renderdoc/android/android_utils.cpp b/renderdoc/android/android_utils.cpp
index a78af37d6..13bd40d4e 100644
--- a/renderdoc/android/android_utils.cpp
+++ b/renderdoc/android/android_utils.cpp
@@ -256,9 +256,6 @@ rdcstr GetFriendlyName(const rdcstr &deviceID)
   else if(!manuf.empty() && !model.empty())
     combined = manuf + " " + model;
 
-  if(!IsSupported(deviceID))
-    combined += " - (Android 5.x)";
-
   return combined;
 }