tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Replace a segfault with a warning." into jb-mr1-dev

Browse source
This commit is contained in:
John Grossman 2012-08-20 16:48:13 -07:00 committed by Android (Google) Code Review
commit 9dd0029a05
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/adb.c
View file

@ -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 */