Elliott Hughes
35096f4cf8
am fa76ffcc: Merge "adb: win32: fix logging to adb.log"
...
* commit 'fa76ffccaa723538ad09255353538911ae390322':
adb: win32: fix logging to adb.log
2015-06-08 22:29:13 +00:00
Mark Salyzyn
7a518d0e6f
am 03196c9c: logd: build breakage
...
* commit '03196c9c7566bc8d6b05019d37a1e60dc3b398f4':
logd: build breakage
2015-06-08 22:27:12 +00:00
Elliott Hughes
6af8e11f4c
Merge "Switch to toybox mount(1)."
2015-06-08 22:23:32 +00:00
Elliott Hughes
fa76ffccaa
Merge "adb: win32: fix logging to adb.log"
2015-06-08 22:21:31 +00:00
Mark Salyzyn
3c717e4862
am fb354cd6: am 69ecfdd5: Merge "logd: build breakage"
...
* commit 'fb354cd6af5bccc42ab1ecabd10fb51e698169b9':
logd: build breakage
2015-06-08 22:18:14 +00:00
Mark Salyzyn
fb354cd6af
am 69ecfdd5: Merge "logd: build breakage"
...
* commit '69ecfdd570c30ccdf541d16298e7a7e8a48de8b7':
logd: build breakage
2015-06-08 22:03:21 +00:00
Mark Salyzyn
03196c9c75
logd: build breakage
...
(cherry pick from 3e21de2915
)
OPEN_BRACKET_SPACE comparison always false
Change-Id: I1ff4288b4b79a49702727d3a8b8c8f179f500951
2015-06-08 14:57:07 -07:00
Mark Salyzyn
69ecfdd570
Merge "logd: build breakage"
2015-06-08 21:55:52 +00:00
Elliott Hughes
24d41e76e7
Switch to toybox mount(1).
...
Change-Id: Ieda6e2bfbf5ea3e9a96f5facfded4c2a467e4a02
2015-06-08 14:52:25 -07:00
Mark Salyzyn
3e21de2915
logd: build breakage
...
OPEN_BRACKET_SPACE comparison always false
Change-Id: I1ff4288b4b79a49702727d3a8b8c8f179f500951
2015-06-08 14:52:14 -07:00
Mark Salyzyn
d00930a33b
am b14f1211: am 4d5f5417: Merge "logd: fix kernel logline stutter" into mnc-dev
...
* commit 'b14f1211f9a87e96f28550519e82a53efc24de5a':
logd: fix kernel logline stutter
2015-06-08 21:31:04 +00:00
Mark Salyzyn
b14f1211f9
am 4d5f5417: Merge "logd: fix kernel logline stutter" into mnc-dev
...
* commit '4d5f54174a8f06c4c0ae87f555cdc4c3b0eed165':
logd: fix kernel logline stutter
2015-06-08 21:18:56 +00:00
Mark Salyzyn
0ea749fa76
am ad26b868: am 2c6a1b7e: am 42951a8b: Merge "logd: fix kernel logline stutter"
...
* commit 'ad26b8684f7d6e06175f2b01addde6d8854e8d5f':
logd: fix kernel logline stutter
2015-06-08 21:09:09 +00:00
Eino-Ville Talvala
467fb13e54
am 2857eada: am 414fb90e: Camera: Add new set video format/dataspace command
...
* commit '2857eada5fa32fedae2e26200543d95ce4f09080':
Camera: Add new set video format/dataspace command
2015-06-08 21:09:08 +00:00
Mark Salyzyn
ad26b8684f
am 2c6a1b7e: am 42951a8b: Merge "logd: fix kernel logline stutter"
...
* commit '2c6a1b7ec0af13dad6e77d75e03dce8ac76de8b7':
logd: fix kernel logline stutter
2015-06-08 20:59:08 +00:00
Mark Salyzyn
4d5f54174a
Merge "logd: fix kernel logline stutter" into mnc-dev
2015-06-08 20:56:02 +00:00
Mark Salyzyn
df5902c4f3
logd: fix kernel logline stutter
...
(cherry pick from commit 2c3b300fd8
)
- look for cases where one log line contains two without a newline.
- rare condition, occurs when a printk does not have
a terminating newline under certain race conditions.
- the newline may be performed broken up as a second call
- the timestamps can be reversed (showing the race effects).
- driver(s) should really have the newline in their log messages.
Change-Id: Ibfb56b32047da3d6513db059ca6edad0f0105168
2015-06-08 13:55:14 -07:00
Eino-Ville Talvala
2857eada5f
am 414fb90e: Camera: Add new set video format/dataspace command
...
* commit '414fb90eae816e98d8b2d45a3dbce70f1dbc2064':
Camera: Add new set video format/dataspace command
2015-06-08 20:51:54 +00:00
Mark Salyzyn
2c6a1b7ec0
am 42951a8b: Merge "logd: fix kernel logline stutter"
...
* commit '42951a8be7c8fbdfa95d431142194c52e81d1c63':
logd: fix kernel logline stutter
2015-06-08 20:45:53 +00:00
Mark Salyzyn
42951a8be7
Merge "logd: fix kernel logline stutter"
2015-06-08 20:33:13 +00:00
Eino-Ville Talvala
414fb90eae
Camera: Add new set video format/dataspace command
...
This allows the video encoding subsystem inform the camera what format
and dataspace should be used for metadata-mode buffers.
This is necessary to allow software encoders and other generic
consumers that cannot interpret
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED buffers.
Bug: 13222807
Change-Id: I01090dc4dce11f075f7d3cd86daca5ecf3d9e995
2015-06-08 13:21:27 -07:00
Mark Salyzyn
2c3b300fd8
logd: fix kernel logline stutter
...
- look for cases where one log line contains two without a newline.
- rare condition, occurs when a printk does not have
a terminating newline under certain race conditions.
- the newline may be performed broken up as a second call
- the timestamps can be reversed (showing the race effects).
- driver(s) should really have the newline in there log messages.
Change-Id: Ibfb56b32047da3d6513db059ca6edad0f0105168
2015-06-08 13:10:31 -07:00
Oleksiy Vyalov
da31778f3b
Extend run-as with optional --user argument.
...
1. Calculate AID for spawned process as (100000 * $user) + uid_from_packages.list
2. Use /data/user/$user/$packageDir as a root of a new process if $user != 0.
Change-Id: I761dfb481114bd51e5a950307fcaf403e96eef10
2015-06-07 19:12:50 -07:00
Elliott Hughes
9187fb5985
am 01cf95dd: am b71c8a29: am e1061914: Merge "Make start/stop warn if you\'re not root."
...
* commit '01cf95ddd54d12457c744a2ab2d6dd7ad026aa36':
Make start/stop warn if you're not root.
2015-06-06 17:04:30 +00:00
Elliott Hughes
13c66522dc
am 71ae73c0: am b4d0722d: am a9456438: Merge "Fix test_adb.py against production builds."
...
* commit '71ae73c01dd8ef12b69e25b5925cd85bc1bfd91d':
Fix test_adb.py against production builds.
2015-06-06 17:04:28 +00:00
Paul Lawrence
64f69a73e4
am 0ec4b936: am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to"
...
* commit '0ec4b9363a0298b2da532d3591f4ae99b04d88db':
adb shouldn't trace unless told to
2015-06-06 17:04:27 +00:00
Elliott Hughes
01cf95ddd5
am b71c8a29: am e1061914: Merge "Make start/stop warn if you\'re not root."
...
* commit 'b71c8a293a22d116796174b571afbaacccc3bc10':
Make start/stop warn if you're not root.
2015-06-06 00:35:21 +00:00
Elliott Hughes
71ae73c01d
am b4d0722d: am a9456438: Merge "Fix test_adb.py against production builds."
...
* commit 'b4d0722d7dedece03e560dc13eb6b56bf18eeae6':
Fix test_adb.py against production builds.
2015-06-06 00:35:20 +00:00
Paul Lawrence
0ec4b9363a
am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to"
...
* commit '439cdfd0bfa8ee2cf0996f517e61ab9f7d90bdc6':
adb shouldn't trace unless told to
2015-06-06 00:35:18 +00:00
Elliott Hughes
b71c8a293a
am e1061914: Merge "Make start/stop warn if you\'re not root."
...
* commit 'e1061914363d85679afb29458c85c3bdf3311aac':
Make start/stop warn if you're not root.
2015-06-06 00:23:08 +00:00
Elliott Hughes
b4d0722d7d
am a9456438: Merge "Fix test_adb.py against production builds."
...
* commit 'a945643831db4ec58988a0773a89f3858d282b07':
Fix test_adb.py against production builds.
2015-06-06 00:23:07 +00:00
Paul Lawrence
439cdfd0bf
am af0baad7: Merge "adb shouldn\'t trace unless told to"
...
* commit 'af0baad7a6407cf098aa64272e1321f7a495874a':
adb shouldn't trace unless told to
2015-06-06 00:23:06 +00:00
Elliott Hughes
e106191436
Merge "Make start/stop warn if you're not root."
2015-06-06 00:18:33 +00:00
Elliott Hughes
a945643831
Merge "Fix test_adb.py against production builds."
2015-06-06 00:16:23 +00:00
Paul Lawrence
af0baad7a6
Merge "adb shouldn't trace unless told to"
2015-06-06 00:08:57 +00:00
Elliott Hughes
6e83c3d76d
Make start/stop warn if you're not root.
...
Bug: https://code.google.com/p/android/issues/detail?id=165602
Change-Id: Ia1e2de1697d971381b0c949fdaaeff424ab8bf32
2015-06-05 17:01:01 -07:00
Paul Lawrence
6f009d9496
adb shouldn't trace unless told to
...
Prevents clean unmount of /data in crypto bounce
Bug: 21516860
Change-Id: I1f761dfdf216dcb35b4609cd46cc4d0644cc4a81
2015-06-05 16:01:48 -07:00
Mark Salyzyn
95ba818cda
am 7c7b0c83: am dca1bb5e: Merge "logd: filters remove leading expire messages and rate" into mnc-dev
...
* commit '7c7b0c83d63aa31178ad74be62a2e784df490c99':
logd: filters remove leading expire messages and rate
2015-06-05 22:34:05 +00:00
Mark Salyzyn
7c7b0c83d6
am dca1bb5e: Merge "logd: filters remove leading expire messages and rate" into mnc-dev
...
* commit 'dca1bb5e79e197676356f374939b7ca5dfd1a195':
logd: filters remove leading expire messages and rate
2015-06-05 22:24:19 +00:00
Mark Salyzyn
dca1bb5e79
Merge "logd: filters remove leading expire messages and rate" into mnc-dev
2015-06-05 21:58:07 +00:00
Elliott Hughes
0ff70a3432
am 04440506: am 8bdd4bbc: Add a working Windows tmpfile(3) to fastboot.
...
* commit '044405069af86b6df3ab9c6da552cc8851e94c64':
Add a working Windows tmpfile(3) to fastboot.
2015-06-05 21:01:13 +00:00
Elliott Hughes
044405069a
am 8bdd4bbc: Add a working Windows tmpfile(3) to fastboot.
...
* commit '8bdd4bbc1cca8b61eb3f2c8dd0335735fc84f4b0':
Add a working Windows tmpfile(3) to fastboot.
2015-06-05 20:53:11 +00:00
Jim Miller
1bdd23a814
am a3e3b196: am 72ffc3c0: Fix error on systems where ssize_t isn\'t 64-bits
...
* commit 'a3e3b196bd8cfe26b7232a9da4b054f750c16679':
Fix error on systems where ssize_t isn't 64-bits
2015-06-05 20:35:33 +00:00
Elliott Hughes
8bdd4bbc1c
Add a working Windows tmpfile(3) to fastboot.
...
Windows' tmpfile(3) implementation requires administrator rights because
it creates temporary files in the root directory. Write an alternative
that uses the user's temporary directory instead.
Bug: http://b/21558406
Change-Id: Ic9aece5c69429797a332a97681a76b76ac3551bf
(cherry picked from commit a26fbeeaa4
)
2015-06-05 13:28:44 -07:00
Jim Miller
a3e3b196bd
am 72ffc3c0: Fix error on systems where ssize_t isn\'t 64-bits
...
* commit '72ffc3c02a5546ab93ffcbb2a94193be651c3629':
Fix error on systems where ssize_t isn't 64-bits
2015-06-05 20:23:06 +00:00
Elliott Hughes
3595328564
Fix test_adb.py against production builds.
...
Also use assertEqual for better errors. (I accidentally tested against
a non-AOSP build that doesn't have the \r fix.)
Change-Id: Ib032c01efa4e1efb14467ca776a14160fff4ad39
2015-06-05 13:11:43 -07:00
Jim Miller
72ffc3c02a
Fix error on systems where ssize_t isn't 64-bits
...
Fixes bug 21491366
Change-Id: If34ab89fdb410350fa5773b5495a27493a6d1211
2015-06-05 12:25:17 -07:00
Mark Salyzyn
da8b091cee
am 5d634ecd: am 57a3407d: am 515d581d: Merge "logd: filters remove leading expire messages and rate"
...
* commit '5d634ecd9064a502f1ba9895196aa8e5fb79e115':
logd: filters remove leading expire messages and rate
2015-06-05 17:54:13 +00:00
Mark Salyzyn
5d634ecd90
am 57a3407d: am 515d581d: Merge "logd: filters remove leading expire messages and rate"
...
* commit '57a3407d7ef703f5d17f1a59d2d95a8d62d9a6ed':
logd: filters remove leading expire messages and rate
2015-06-05 17:39:17 +00:00
Mark Salyzyn
57a3407d7e
am 515d581d: Merge "logd: filters remove leading expire messages and rate"
...
* commit '515d581d2d99e484c5989f1ee06f42ba1cb6942d':
logd: filters remove leading expire messages and rate
2015-06-05 17:27:09 +00:00