JP Abgrall
8f672edfa4
am d4148e94: am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit 'd4148e94e97c6abe402e819f6164276575a91936':
adb: fix windows build after "forward --list" fix.
2014-03-07 19:00:41 +00:00
JP Abgrall
076a4bfd80
am 9d6abbda: am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '9d6abbdaccd520055fc47b6b3b36232cf23897fd':
Fix adb forward --list when forwarding a lot
2014-03-07 19:00:39 +00:00
Andy Hung
173f4995b0
Update audio_bytes_per_sample for PCM 24 bit packed
...
Change-Id: Ic79f604893f5c4f2e8e35189d6638b5b160435ed
Signed-off-by: Andy Hung <hunga@google.com>
2014-03-07 18:20:15 +00:00
JP Abgrall
d4148e94e9
am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit 'ecac99b54ce704f282ff6706f8cfada48f41b35c':
adb: fix windows build after "forward --list" fix.
2014-03-07 03:50:24 +00:00
JP Abgrall
ecac99b54c
am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit '1367854a891090d1be1edfb12515691b20b350cf':
adb: fix windows build after "forward --list" fix.
2014-03-07 03:47:03 +00:00
JP Abgrall
1367854a89
Merge "adb: fix windows build after "forward --list" fix."
2014-03-07 03:42:04 +00:00
JP Abgrall
5b0bb4898c
adb: fix windows build after "forward --list" fix.
...
EWOULDBLOCK is not there on windows.
It gets translated by the adb_write() wrapper into EGAIN.
But the Linux one does not translate EWOULDBLOCK into EGAIN.
Without EWOULDBLOCK, it works just fine.
Change-Id: Ic293be392aa4364637428ea94ef87890ffa09b9b
Signed-off-by: JP Abgrall <jpa@google.com>
2014-03-06 19:40:45 -08:00
JP Abgrall
9d6abbdacc
am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '9f573bb362c3716c54df77d85a0285897daa242a':
Fix adb forward --list when forwarding a lot
2014-03-07 03:08:07 +00:00
JP Abgrall
9f573bb362
am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb':
Fix adb forward --list when forwarding a lot
2014-03-07 03:04:44 +00:00
Mark Salyzyn
318900ad80
am d01c257f: am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
...
* commit 'd01c257f0f19a30178a6d5ec9d6d00d6b702fed3':
logd: liblog: 64-bit issues
2014-03-07 03:02:41 +00:00
Colin Cross
0f43cf0730
am e4980725: am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
...
* commit 'e4980725dc14c913978a3bdb30dd1844781bbd27':
Fix the build for NEON in libpixelflinger
2014-03-07 03:02:40 +00:00
JP Abgrall
66e95d76c4
Merge "Fix adb forward --list when forwarding a lot"
2014-03-07 02:59:03 +00:00
Mark Salyzyn
d01c257f0f
am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
...
* commit '8f63232712e318da88d2f543fe29066c26d39c32':
logd: liblog: 64-bit issues
2014-03-06 22:41:23 +00:00
Colin Cross
e4980725dc
am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
...
* commit '9690230a3c22977be24006d24ea35dd3efadc362':
Fix the build for NEON in libpixelflinger
2014-03-06 22:41:22 +00:00
Mark Salyzyn
8f63232712
am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
...
* commit 'bb0fbdbefd7079859e4df45f1b75ad6c48839a50':
logd: liblog: 64-bit issues
2014-03-06 21:02:36 +00:00
Colin Cross
9690230a3c
am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
...
* commit '0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650':
Fix the build for NEON in libpixelflinger
2014-03-06 21:02:36 +00:00
Jesse Hall
7d2998ea18
Merge "Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*"
2014-03-06 19:05:25 +00:00
Mark Salyzyn
bb0fbdbefd
Merge "logd: liblog: 64-bit issues"
2014-03-06 18:59:35 +00:00
Colin Cross
0a8a56361e
Merge "Fix the build for NEON in libpixelflinger"
2014-03-06 18:15:56 +00:00
Kévin PETIT
d82b2a3eb4
Fix the build for NEON in libpixelflinger
...
ARCH_ARM_HAVE_NEON is only ever defined to true, so test for that.
For the NEON function to be used, the file has to include
machine/cpu-features.h so that __ARM_HAVE_NEON is defined.
Change-Id: I0db196b39c493092415859e009531fcff6fc1e8b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-03-06 15:53:27 +00:00
Jesse Hall
29cc9ce49a
Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*
...
Change-Id: I232dfa2ad2e4a463a39e2e901e4097dffe278cc3
2014-03-05 16:12:41 -08:00
Mark Salyzyn
7e2f83c0bc
logd: liblog: 64-bit issues
...
- structure packing
- move towards log_time from struct timespec
- extend log_time to cover differences between
log_time and struct timespec
Change-Id: I106ed0b609917306d170044054b5b32645f2a295
2014-03-05 16:12:28 -08:00
Mathieu Chartier
fa810f4c4e
am d8ed565f: am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."
...
* commit 'd8ed565f1541ccda63254f236064fa22be9ecbf9':
Add free to CloseArchive.
2014-03-05 19:19:01 +00:00
Mathieu Chartier
d8ed565f15
am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."
...
* commit 'f27f9e10f50a015ec2d76a2f3579a5d11932965e':
Add free to CloseArchive.
2014-03-05 19:16:28 +00:00
Mathieu Chartier
f27f9e10f5
am 51ebffd8: Merge "Add free to CloseArchive."
...
* commit '51ebffd8a5536af09b60950bf7cf6f020c962f8a':
Add free to CloseArchive.
2014-03-05 19:13:53 +00:00
Mathieu Chartier
51ebffd8a5
Merge "Add free to CloseArchive."
2014-03-05 19:10:28 +00:00
Todd Poynor
6f26891d67
libsuspend: use wakeup count interface for system suspend
...
Use the wakeup count interface for requesting suspend, instead of
autosleep, to allow userspace to collect stats on suspend/resume
activity.
Change-Id: I44b5ef031b2bdc5b09c904fb2adbbe16370c2984
2014-03-04 20:02:53 -08:00
Colin Cross
d030033a39
am 933f0b88: am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with the standard."
...
* commit '933f0b88e4232f58f171b8217d7871f97a927c57':
Use the getopt function in compliance with the standard.
2014-03-05 01:50:32 +00:00
Colin Cross
933f0b88e4
am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with the standard."
...
* commit 'f21b6b9217efc86ae753e5c57a05ff05e631bd3e':
Use the getopt function in compliance with the standard.
2014-03-05 01:47:58 +00:00
Mathieu Chartier
5f98b12640
Add free to CloseArchive.
...
Currently CloseArchive doesn't call free and call sites don't appear
to either. I could not find any call sites which manually freed the
archive by deleting the handle. This fixes several memory leaks.
Change-Id: I21f187dde60fd87e6e54bde06de9e76fd0791104
2014-03-04 17:44:58 -08:00
Colin Cross
f21b6b9217
am 87a56eb6: Merge "Use the getopt function in compliance with the standard."
...
* commit '87a56eb6cc616150d536ed0e70cf8e69e1d5edf6':
Use the getopt function in compliance with the standard.
2014-03-05 01:44:22 +00:00
Colin Cross
87a56eb6cc
Merge "Use the getopt function in compliance with the standard."
2014-03-05 01:39:57 +00:00
Nick Kralevich
6e681af519
am 71ca8381: am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data
...
* commit '71ca8381b880d6402e273dc1c9a10a25e5b82572':
don't load property_contexts from /data
2014-03-04 20:46:23 +00:00
Nick Kralevich
71ca8381b8
am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data
...
* commit '6783d7cf166feb943a5cdcd74c8da1f7a160fc2d':
don't load property_contexts from /data
2014-03-04 20:42:29 +00:00
Nick Kralevich
6783d7cf16
am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /data
...
* commit '93412622859014cc8bd39c30101096d03300845c':
don't load property_contexts from /data
2014-03-04 20:36:57 +00:00
Dmitriy Ivanov
fbbc85ea8e
am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"
...
* commit '6bb6372b3ee930e2e8517262ec7db4f057a50725':
fix: making lsof show devies and loaded .so file names correctly
2014-03-04 20:16:46 +00:00
Dmitriy Ivanov
6bb6372b3e
am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"
...
* commit '508240c3798799e5d177d03604798f38366a4a4a':
fix: making lsof show devies and loaded .so file names correctly
2014-03-04 20:13:54 +00:00
Dmitriy Ivanov
508240c379
am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"
...
* commit '2a16a5847a2811626a108f8cbd7606680647df86':
fix: making lsof show devies and loaded .so file names correctly
2014-03-04 20:10:21 +00:00
Dmitriy Ivanov
2a16a5847a
Merge "fix: making lsof show devies and loaded .so file names correctly"
2014-03-04 20:05:22 +00:00
Nick Kralevich
da56648374
am be2dfb68: am f773d127: resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp
...
* commit 'be2dfb684caf760937bae61b79c7dfe390be04d0':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-03-04 19:58:58 +00:00
Nick Kralevich
be2dfb684c
am f773d127: resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp
...
* commit 'f773d127849b25838df032bced80ecf9f98a0633':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-03-04 19:56:37 +00:00
Nick Kralevich
9341262285
am 726beb6c: am 6941a83c: don\'t load property_contexts from /data
...
* commit '726beb6c4a02d14cc4637ec61cba09dbe097a149':
don't load property_contexts from /data
2014-03-04 19:37:34 +00:00
Nick Kralevich
f773d12784
resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp
...
Change-Id: I20b005efaa84d86d22f6af7a81ade36a606a1d21
2014-03-04 11:35:19 -08:00
Nick Kralevich
726beb6c4a
am 6941a83c: don\'t load property_contexts from /data
...
* commit '6941a83c2dd34df606df13972576fbc23172c3c5':
don't load property_contexts from /data
2014-03-04 19:34:16 +00:00
Dmitriy Ivanov
7c1fc0ed42
fix: making lsof show devies and loaded .so file names correctly
...
Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
2014-03-04 11:17:57 -08:00
Nick Kralevich
6941a83c2d
don't load property_contexts from /data
...
Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11 )
2014-03-04 19:14:34 +00:00
Daniel Cashman
4bf3bb679a
Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file." into klp-modular-dev
2014-03-04 18:29:30 +00:00
Nick Kralevich
dcc4a31da9
am 3e36cbb0: am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.
...
* commit '3e36cbb096ea6334e136446821fc2897a2e0c64e':
Remove obsolete vdc call.
2014-03-04 08:34:03 +00:00
Nick Kralevich
3e36cbb096
am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.
...
* commit '7cd7ad5216d4c4946ebbefc78382ef78d510afc1':
Remove obsolete vdc call.
2014-03-04 08:32:05 +00:00
Nick Kralevich
7cd7ad5216
am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.
...
* commit '5e96d89aa5da72fdd20c719cd35eff36e27ecab2':
Remove obsolete vdc call.
2014-03-04 08:29:46 +00:00