Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a46170 authored by John Grossman's avatar John Grossman Committed by Android Git Automerger
Browse files

am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev 

* commit '9dd0029a':
  Replace a segfault with a warning.
parents 95ddeb0e 9dd0029a

adb/adb.c

+7 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,13 @@ int adb_main(int is_daemon, int server_port) 


    // Our external storage path may be different than apps, since

    // we aren't able to bind mount after dropping root.

    setenv("EXTERNAL_STORAGE", getenv("ADB_EXTERNAL_STORAGE"), 1);

    const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE");

    if (NULL != adb_external_storage) {

        setenv("EXTERNAL_STORAGE", adb_external_storage, 1);

    } else {

        D("Warning: ADB_EXTERNAL_STORAGE is not set.  Leaving EXTERNAL_STORAGE"

          " unchanged.\n");

    }



    /* don't listen on a port (default 5037) if running in secure mode */

    /* don't run as root if we are running in secure mode */