diff options
| author | David Turner <digit@android.com> | 2014-02-14 17:27:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-14 17:27:15 +0000 |
| commit | d866c5779564ddcbcf4382cb653c226ae3cd0501 (patch) | |
| tree | ce137d8432c48e7f7d9618f48400952065b340e9 | |
| parent | 5b31b113176dec8d7fcfb5650f3dd7b01baf605c (diff) | |
| parent | 155ca91c1253bcb85a0eeec93ded6da07122d4ff (diff) | |
| download | android_device_generic_goldfish-d866c5779564ddcbcf4382cb653c226ae3cd0501.tar.gz android_device_generic_goldfish-d866c5779564ddcbcf4382cb653c226ae3cd0501.tar.bz2 android_device_generic_goldfish-d866c5779564ddcbcf4382cb653c226ae3cd0501.zip | |
am 155ca91c: Merge topic \'emu64\'
* commit '155ca91c1253bcb85a0eeec93ded6da07122d4ff':
Disable echo on all tty lines
ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
| -rw-r--r-- | qemud/qemud.c | 2 | ||||
| -rw-r--r-- | ueventd.goldfish.rc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qemud/qemud.c b/qemud/qemud.c index e836376..543ce35 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1629,7 +1629,7 @@ multiplexer_init( Multiplexer* m, const char* serial_dev ) strerror(errno) ); } // disable echo on serial lines - if ( !memcmp( serial_dev, "/dev/ttyS", 9 ) ) { + if ( !memcmp( serial_dev, "/dev/tty", 8 ) ) { struct termios ios; tcgetattr( fd, &ios ); ios.c_lflag = 0; /* disable ECHO, ICANON, etc... */ diff --git a/ueventd.goldfish.rc b/ueventd.goldfish.rc index 8de7049..2c3ac4e 100644 --- a/ueventd.goldfish.rc +++ b/ueventd.goldfish.rc @@ -1,5 +1,6 @@ # These settings are specific to running under the Android emulator /dev/qemu_trace 0666 system system /dev/qemu_pipe 0666 system system +/dev/goldfish_pipe 0666 system system /dev/ttyS* 0666 system system /proc 0666 system system |