Than McIntosh
e8efd0d6bf
Move perfprofd to late_start class.
...
Bug: http://b/19483574
Change-Id: I88649b50b95cbddb7d0671a5499232cbef156c48
2015-05-27 14:02:11 -04:00
Eino-Ville Talvala
df93020b28
am 0ca24ff5: Merge "Graphics depth formats: Add confidence values" into mnc-dev
...
* commit '0ca24ff56b553737e8722e86e6c3b3af4b550d82':
Graphics depth formats: Add confidence values
2015-05-27 18:01:03 +00:00
Michael Lentine
2d2456b4b6
am 338142aa: Merge "Adding a build id check to blob cache." into mnc-dev
...
* commit '338142aa81fa4e67065e82cc45bea8424db3a7f4':
Adding a build id check to blob cache.
2015-05-27 18:01:02 +00:00
Eino-Ville Talvala
0ca24ff56b
Merge "Graphics depth formats: Add confidence values" into mnc-dev
2015-05-27 17:40:25 +00:00
Michael Lentine
338142aa81
Merge "Adding a build id check to blob cache." into mnc-dev
2015-05-27 17:39:23 +00:00
Adam Lesinski
9bd7afc0a1
Prevent integer overflow when allocating native_handle_t
...
User specified values of numInts and numFds can overflow
and cause malloc to allocate less than we expect, causing
heap corruption in subsequent operations on the allocation.
Bug: 19334482
Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55
2015-05-27 10:20:03 -07:00
Andres Morales
ae242929da
[gatekeeperd] return brute-force throttling information
...
Bug: 21118563
Change-Id: I13c6a44f61668be8b4c1fde8c84dcfebab84517c
2015-05-27 07:45:22 -07:00
Eino-Ville Talvala
20651b5c7d
Graphics depth formats: Add confidence values
...
Supplement the dense and sparse depth image formats with
confidence values.
For {HAL_PIXEL_FORMAT_Y_16, HAL_DATASPACE_DEPTH}, use the 3 MSBs
for confidence.
For {HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_DEPTH}, add a 4th float
value for confidence.
Bug: 20123879
Change-Id: Idc27081efec682a712ce77ccfec59328f298b944
2015-05-26 14:50:48 -07:00
Mark Salyzyn
62d6a2a921
logd: test modernization
...
Bug: 19603976
Change-Id: Ie920c128e7e6a436fea7a96c7d68bc39e13a2ad4
2015-05-26 12:24:51 -07:00
Nick Kralevich
d482e6ab96
am 4b7ddd61: Merge "Don\'t use TEMP_FAILURE_RETRY on close()" into mnc-dev
...
* commit '4b7ddd6105c44b01b473c5ed1035b6be34ba19e2':
Don't use TEMP_FAILURE_RETRY on close()
2015-05-23 16:23:05 +00:00
Nick Kralevich
4b7ddd6105
Merge "Don't use TEMP_FAILURE_RETRY on close()" into mnc-dev
2015-05-23 16:04:00 +00:00
Nick Kralevich
12c67f4dfe
Don't use TEMP_FAILURE_RETRY on close()
...
See https://lkml.org/lkml/2005/9/10/129 for details.
(cherry-picked from commit 95db36e128
)
Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
2015-05-23 16:03:06 +00:00
Thierry Strudel
604e75449d
am 91cf41cf: init: wait_for_file use smaller time resolution
...
* commit '91cf41cf43847930a8e55b3789d4943a8e22f73a':
init: wait_for_file use smaller time resolution
2015-05-22 23:48:00 +00:00
Thierry Strudel
91cf41cf43
init: wait_for_file use smaller time resolution
...
As 1s timeout can be requested, using second resolution time to check
for timeout prevent from being accurate on the actual time we wait.
Use available gettime_ns instead.
Bug: 21374269
Change-Id: I8be1b69e02beacc7196427f97855e036addf54d1
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-05-22 16:03:12 -07:00
Paul Lawrence
ffdac6ddf2
am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init.""
...
* commit 'f0b318d61cc129f4ddd25859500857b9f8e34e69':
Revert "Set up crypto for user directories in init."
2015-05-22 19:41:48 +00:00
Paul Lawrence
f0b318d61c
am 7c789575: Merge "Revert "Set up crypto for user directories in init.""
...
* commit '7c7895755cf23140f08b7416ceff006dbbf7a411':
Revert "Set up crypto for user directories in init."
2015-05-22 19:28:49 +00:00
Paul Lawrence
7c7895755c
Merge "Revert "Set up crypto for user directories in init.""
2015-05-22 19:19:14 +00:00
Paul Lawrence
2e24bcfdce
Revert "Set up crypto for user directories in init."
...
Causes a boot loop in Shamu
This reverts commit ce6f716096
.
Bug: 21396871
Change-Id: I9709053c589807d4530a3a99bd84e5b3177316cd
2015-05-22 18:32:45 +00:00
Dan Albert
e2a306d778
am 42318b81: am 0211d360: Merge "Generalize Join to work for any container/element."
...
* commit '42318b810958311ecd3d956f89143b168ec41f84':
Generalize Join to work for any container/element.
2015-05-22 17:31:55 +00:00
Dan Albert
42318b8109
am 0211d360: Merge "Generalize Join to work for any container/element."
...
* commit '0211d36054b7390dfedd2485893e2dacaf7052da':
Generalize Join to work for any container/element.
2015-05-22 17:21:41 +00:00
Dan Albert
0211d36054
Merge "Generalize Join to work for any container/element."
2015-05-22 17:15:11 +00:00
Dan Albert
e0da8a1d37
Generalize Join to work for any container/element.
...
This is more scalable than explicitly instantiating templates for the
cross product of containers and element types.
Specifically I'm adding this so I can join an unordered_set in adb.
Change-Id: I0055f3390a0ff26a886a0d41bbf0d4fe3d210f9c
2015-05-22 10:07:06 -07:00
Dan Albert
f80d4607e8
am 8b667359: am 3ff23e24: Merge "Improve logging."
...
* commit '8b667359a066db11d303ce727015e596f29f04a0':
Improve logging.
2015-05-21 23:52:12 +00:00
Dan Albert
8b667359a0
am 3ff23e24: Merge "Improve logging."
...
* commit '3ff23e2461de5a5aae4343147486df84e8a77d90':
Improve logging.
2015-05-21 23:40:58 +00:00
Dan Albert
3ff23e2461
Merge "Improve logging."
2015-05-21 23:26:36 +00:00
Dan Albert
9313c0df20
Improve logging.
...
Any output from the LOG family will now go to stderr and logcat on the
device. stderr is usually redirected to a log file, but that is now
inhibited for adbd if being run from a tty (useful when debugging with
the serial console).
This also fixes sending logs to the file on device for the trace mask
of "all". The "all" tag was specifically handled to return early from
the function, preventing the file initialization from happening.
Change-Id: Id253577bfd1500fbce92dbfba0f9be23dbfd5ee4
2015-05-21 16:25:57 -07:00
Dan Albert
f4b5edf8e4
am b7f47c00: am 36473768: Merge "Clean up adb_trace_init."
...
* commit 'b7f47c0048dca475be194a473b5f53a3d0c15386':
Clean up adb_trace_init.
2015-05-21 23:25:13 +00:00
Dan Albert
b7f47c0048
am 36473768: Merge "Clean up adb_trace_init."
...
* commit '36473768ef6996f2ddf767385a56964e3c88575d':
Clean up adb_trace_init.
2015-05-21 23:13:20 +00:00
Dan Albert
eea13f7134
am 16785a5b: am db037bcd: Merge "Make atransport be a real class."
...
* commit '16785a5bd804c059c08bf49259bb78de4145aa8c':
Make atransport be a real class.
2015-05-21 23:12:44 +00:00
Dan Albert
36473768ef
Merge "Clean up adb_trace_init."
2015-05-21 23:03:50 +00:00
Dan Albert
16785a5bd8
am db037bcd: Merge "Make atransport be a real class."
...
* commit 'db037bcd221c6116434f6ae555e65e6e1db77ff7':
Make atransport be a real class.
2015-05-21 23:00:42 +00:00
Dan Albert
11848f5761
am bc4b8c18: am 9dd0914a: Merge "Turn on -Wextra."
...
* commit 'bc4b8c1845388a82435346483742757c3a52dcfa':
Turn on -Wextra.
2015-05-21 23:00:25 +00:00
Dan Albert
db037bcd22
Merge "Make atransport be a real class."
2015-05-21 22:53:40 +00:00
Dan Albert
c7915a3470
Make atransport be a real class.
...
Using non-POD types in atransport means we'll need to start treating
it as a real class (specifically with regards to new/delete rather
than malloc/free).
I've also cleaned up the home grown linked lists for transport_list
and pending_list to just be std::lists. We might want to refactor that
again to be an std::unordered_map keyed on serial, since that seems to
be a common way to search it.
Change-Id: I7f5e23cdc47944a9278099723ca029585fe52105
2015-05-21 15:49:05 -07:00
Dan Albert
bc4b8c1845
am 9dd0914a: Merge "Turn on -Wextra."
...
* commit '9dd0914ac96e77a725c696dd557d56528316e8de':
Turn on -Wextra.
2015-05-21 22:47:15 +00:00
Dan Albert
9dd0914ac9
Merge "Turn on -Wextra."
2015-05-21 22:38:40 +00:00
Dan Albert
23fee8fcf5
Turn on -Wextra.
...
Change-Id: I3cddd6d949fdfa79312246670c37475276734f41
2015-05-21 15:15:11 -07:00
Dan Albert
e246219d0c
Clean up adb_trace_init.
...
Old code was a mess for splitting a string and then searching a list
when they really wanted a map.
To more closely match ANDROID_LOG_TAG, only use a space separated list
rather than space/colon/semi-colon/comma.
Change-Id: I915ff4968e42d5f8dec1b43b6eacc0c8d7b44d7b
2015-05-21 15:03:44 -07:00
Paul Crowley
e8cbb421cd
am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init."
...
* commit '5f3c715e1a8331f13ea39264b24dfc03ac8db060':
Set up crypto for user directories in init.
2015-05-21 21:59:40 +00:00
Paul Crowley
5f3c715e1a
am 7f623dec: Merge "Set up crypto for user directories in init."
...
* commit '7f623decf31028b5a745a1dc8902ee78d0adb44c':
Set up crypto for user directories in init.
2015-05-21 21:46:39 +00:00
Paul Crowley
7f623decf3
Merge "Set up crypto for user directories in init."
2015-05-21 21:34:12 +00:00
Jim Miller
7ea1d685a2
am a552f07f: Remove unused include
...
* commit 'a552f07f7e9aa75dae814ddff94b33b4506794ab':
Remove unused include
2015-05-21 21:20:43 +00:00
Jim Miller
a552f07f7e
Remove unused include
...
Fixes bug 21370426
Change-Id: I693dc6d741d4ede0a0e44d6b75ade7459ef9a3ed
2015-05-21 13:47:33 -07:00
Mark Salyzyn
c5bf3b8304
logd: whitelist should not preserve expire messages
...
Change-Id: I56275c73191b96aa21e7b4049d401e1f44211f9b
2015-05-21 13:01:56 -07:00
Jim Miller
9c904fabfa
am 62de207f: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
...
* commit '62de207fcd8b70c0ebf6b11d74330e10a456ac8a':
Move from native FingerprintService implementation to fingerprintd
2015-05-21 12:22:09 +00:00
Jim Miller
62de207fcd
Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
2015-05-21 00:57:40 +00:00
Andreas Gampe
3c9ad76330
am 82733bd9: am 02b29c49: Merge "LibNativeBridge: Version 2"
...
* commit '82733bd99022a401258fe83cfc8a3edb31a2e10d':
LibNativeBridge: Version 2
2015-05-21 00:43:57 +00:00
Andreas Gampe
82733bd990
am 02b29c49: Merge "LibNativeBridge: Version 2"
...
* commit '02b29c49d4a6f72f90b2c7565cf25b0971906839':
LibNativeBridge: Version 2
2015-05-21 00:31:16 +00:00
Andreas Gampe
02b29c49d4
Merge "LibNativeBridge: Version 2"
2015-05-21 00:21:02 +00:00
Jim Miller
a34dc46c36
Move from native FingerprintService implementation to fingerprintd
...
This adds a new service, fingerprintd, that manages fingerprint
hardware from a separate process. It provides a binder interface that
FingerprintManager uses to talk to the fingerprint HAL.
Change-Id: I64b92589f4d75743ebe96894f07bec515945c61e
2015-05-20 14:55:31 -07:00