commit 1347d3407e88d9bb9b1143ce8671c2e7954e8a15
author David Anderson <dvander@google.com> Mon Jun 12 22:26:44 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 12 22:26:44 2023 +0000
tree d60dd4011af49b5874947ab0f32d208834519e0e
parent 929a665f029cc1ff49cf2475e96c5f7820d26505
parent 816480b56ec0b96c76fa9145a0c092db0ba3b37e

Merge "fastboot: Include header for ostream_iterator and istream_iterator"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 7994065..a1664a4 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -2231,7 +2231,9 @@
                                       {"version", no_argument, 0, 0},
                                       {0, 0, 0, 0}};
 
-    serial = getenv("ANDROID_SERIAL");
+    serial = getenv("FASTBOOT_DEVICE");
+    if (!serial)
+        serial = getenv("ANDROID_SERIAL");
 
     int c;
     while ((c = getopt_long(argc, argv, "a::hls:S:vw", longopts, &longindex)) != -1) {