summaryrefslogtreecommitdiff
path: root/platform/android/export
diff options
context:
space:
mode:
authorRobbie Cooper <cooperra@users.noreply.github.com>2019-10-14 03:12:01 -0400
committerRobbie Cooper <cooperra@users.noreply.github.com>2019-10-15 16:58:26 -0400
commit37e6a8f901d83a959fb30607ffb7f9ee03cf2882 (patch)
treea5ba914306d143952e69b17aa6770c7d0ff9145b /platform/android/export
parentf3fdfefa09eeaecfec763801c655ee10397c06e5 (diff)
Add connection information and serial number to device description
The description appears when hovering over the one-click-deploy button (top-right). This information helps the user distinguish between their devices if multiple are connected or if the same device is connected by both usb and tcpip (two entries in the list for the same device).
Diffstat (limited to 'platform/android/export')
-rw-r--r--platform/android/export/export.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 1460c336e8..ecf7cad8ba 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -346,9 +346,17 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
} else if (p.begins_with("ro.opengles.version=")) {
uint32_t opengl = p.get_slice("=", 1).to_int();
d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n";
+ } else if (p.begins_with("ro.boot.serialno=")) {
+ d.description += "Serial: " + p.get_slice("=", 1).strip_edges() + "\n";
}
}
+ if (d.usb) {
+ d.description += "Connection: USB\n";
+ } else {
+ d.description += "Connection: " + d.id + "\n";
+ }
+
d.name = vendor + " " + device;
if (device == String()) continue;
}