Commit graph

14831 commits

Author SHA1 Message Date
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
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
Dan Albert
598e09eead am 6bb4d249: am b7930843: Merge "adb / libbase: clean up NOGDI and evil ERROR macro"
* commit '6bb4d249226de97f27db21976b988a09a1eedb0d':
  adb / libbase: clean up NOGDI and evil ERROR macro
2015-05-20 20:10:06 +00:00
Dan Albert
6bb4d24922 am b7930843: Merge "adb / libbase: clean up NOGDI and evil ERROR macro"
* commit 'b7930843d3f0d003ff44a3485a63a123ded6f1cb':
  adb / libbase: clean up NOGDI and evil ERROR macro
2015-05-20 19:56:47 +00:00
Dan Albert
b7930843d3 Merge "adb / libbase: clean up NOGDI and evil ERROR macro" 2015-05-20 19:45:49 +00:00
Mark Salyzyn
ee5e465f87 am 8275cf14: am 9ab8c973: Merge "logd: worst-UID only to preserve a day"
* commit '8275cf149278f671fb34b5f20d706b8bdb25957f':
  logd: worst-UID only to preserve a day
2015-05-20 19:25:40 +00:00
Spencer Low
ac3f7d9a78 adb / libbase: clean up NOGDI and evil ERROR macro
Instead of defining and undefining NOGDI:

1. Always #include "base/logging.h" after #include <windows.h>.
Unfortunately, I could not find an easy way to give the user a
warning/error if they include in the wrong order.

2. base/logging.h does #undef ERROR to undefine the evil ERROR macro
that is from another era and probably a bad idea to begin with.

Change-Id: I995d89620611e849af9d7ec47eb55fc0512377f2
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-05-20 12:25:19 -07:00
Mark Salyzyn
3577b8c566 am 94a811ab: logd: worst-UID only to preserve a day
* commit '94a811ab19006ec6c4d8057f3bf81d79308d28f6':
  logd: worst-UID only to preserve a day
2015-05-20 17:34:13 +00:00
Mark Salyzyn
8275cf1492 am 9ab8c973: Merge "logd: worst-UID only to preserve a day"
* commit '9ab8c973310b80362918c516c1edeec015801adc':
  logd: worst-UID only to preserve a day
2015-05-20 17:13:30 +00:00
Mark Salyzyn
94a811ab19 logd: worst-UID only to preserve a day
(cherry pick from commit 833a9b1e38)

Do not invoke worst-UID pruning in the face of other
UIDs logs that are more than a day old, switch to
pruning oldest only.

Change-Id: Icf988b8d5458400a660d0f8e9d2df3f9d9a4c2d9
2015-05-20 10:03:11 -07:00
Mark Salyzyn
9ab8c97331 Merge "logd: worst-UID only to preserve a day" 2015-05-20 17:00:10 +00:00
Mark Salyzyn
833a9b1e38 logd: worst-UID only to preserve a day
Do not invoke worst-UID pruning in the face of other
UIDs logs that are more than a day old, switch to
pruning oldest only.

Change-Id: Icf988b8d5458400a660d0f8e9d2df3f9d9a4c2d9
2015-05-20 09:47:54 -07:00
Nick Kralevich
1610b953bb am 8d592931: am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"
* commit '8d592931a1a45e99ef963abc0dffc895739ef7ec':
  Don't use TEMP_FAILURE_RETRY on close()
2015-05-20 16:20:53 +00:00
Nick Kralevich
8d592931a1 am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"
* commit '6a8b7b65f59452493423d9a56c7b3d4f1eedfd83':
  Don't use TEMP_FAILURE_RETRY on close()
2015-05-20 16:13:29 +00:00
Nick Kralevich
6a8b7b65f5 Merge "Don't use TEMP_FAILURE_RETRY on close()" 2015-05-20 16:04:37 +00:00