Commit graph

15046 commits

Author SHA1 Message Date
Elliott Hughes
d41dee7fc8 am 641fd2e4: am ebce1470: Merge "adb: fix adb_close() vs. unix_close() usage"
* commit '641fd2e443607aadd2cb98177308241cb633dcbd':
  adb: fix adb_close() vs. unix_close() usage
2015-06-04 22:44:55 +00:00
Elliott Hughes
53a8ccc574 am 0895894c: am e1a06a55: Merge "Fix whitespace in debug logging."
* commit '0895894c4b2dbee3c9b572ecc4b96879971f6185':
  Fix whitespace in debug logging.
2015-06-04 22:44:52 +00:00
Elliott Hughes
641fd2e443 am ebce1470: Merge "adb: fix adb_close() vs. unix_close() usage"
* commit 'ebce1470779ad424bc220ada590ee274dbdfaaa4':
  adb: fix adb_close() vs. unix_close() usage
2015-06-04 22:32:41 +00:00
Elliott Hughes
0895894c4b am e1a06a55: Merge "Fix whitespace in debug logging."
* commit 'e1a06a550275a1b0c385059c1f19061f4b0f8ffa':
  Fix whitespace in debug logging.
2015-06-04 22:32:40 +00:00
Elliott Hughes
ebce147077 Merge "adb: fix adb_close() vs. unix_close() usage" 2015-06-04 22:28:50 +00:00
Elliott Hughes
e1a06a5502 Merge "Fix whitespace in debug logging." 2015-06-04 22:23:45 +00:00
Elliott Hughes
e49236b3da Fix whitespace in debug logging.
Change-Id: I949317deaf782fea18b5c38b22dfd41811608276
2015-06-04 15:21:59 -07:00
Elliott Hughes
1e9d1c5d41 am 25a1341f: Merge changes from topic \'fastboot\' into mnc-dev
* commit '25a1341f44749eb20e4c8c4cf5c42a5f34a8446f':
  Don't say "update package missing" unless we mean it.
  'usb' doesn't need to be global in fastboot.
  Add "fastboot --version".
  libziparchive: fix fallocate failures
  Use base::WriteFully in zip_archive.
  libziparchive: fix clang build
  Avoid mapping output to memory while writing to a file.
2015-06-04 21:09:08 +00:00
Elliott Hughes
25a1341f44 Merge changes from topic 'fastboot' into mnc-dev
* changes:
  Don't say "update package missing" unless we mean it.
  'usb' doesn't need to be global in fastboot.
  Add "fastboot --version".
  libziparchive: fix fallocate failures
  Use base::WriteFully in zip_archive.
  libziparchive: fix clang build
  Avoid mapping output to memory while writing to a file.
2015-06-04 20:47:23 +00:00
Elliott Hughes
966339b2d6 Don't say "update package missing" unless we mean it.
unzip_to_file reports failures itself these days, so there's it's unhelpful
of the caller to just guess what might have gone wrong.

Bug: http://b/21558406
Change-Id: I1e3d06c6cf902b8c6ef333dc60fd8f49680a493b
(cherry picked from commit acdbe92c60)
2015-06-04 13:26:57 -07:00
Elliott Hughes
c688c23286 'usb' doesn't need to be global in fastboot.
Bug: http://b/21558406
Change-Id: Id014399640865d889918661bae0161b3165eee48
(cherry picked from commit c0ce65f961)
2015-06-04 13:26:48 -07:00
Elliott Hughes
e283ca29c5 Add "fastboot --version".
So bug reporters can actually tell us what they're running.

Bug: http://b/21558406
Bug: http://b/21583225
Change-Id: If2a4ae97b4792aa321566603ce2c354a72d32307
(cherry picked from commit 379646b2ca)
2015-06-04 13:26:40 -07:00
Badhri Jagan Sridharan
71aebefe49 libziparchive: fix fallocate failures
The objective of fallocate call seems to be to
make sure that we have enough enough space left
in the disk to house the uncompressed file.
But, fallocate is only supported in the following
file systems:
btrfs, ext4, ocfs2, and xfs

Return error only when fallocate fails due to
lack of space. The immediate ftruncate call is
going to take of the majority of other errors.

Bug: http://b/21558406
Bug: 21561449
Change-Id: I7083f3c7e5d745bd6e8a190ac9020297d638d9d4
(cherry picked from commit a68d0d1fe4)
2015-06-04 13:26:29 -07:00
Narayan Kamath
67ab5d9505 Use base::WriteFully in zip_archive.
We're already linking against libbase but we'll have to add
a libbase dependency to every target that includes libziparchive
as a STATIC_LIBRARY dependency, given that there's no way to
express that what we want (except by adding a LOCAL_WHOLE_STATIC_LIBRARY
dependency on libbase to libziparchive but that seems bad too)

Bug: http://b/21558406
Change-Id: I294ad389a9c61a1134a7bc323da25b0004a8f1e0
(cherry picked from commit e97e66ea7c)
2015-06-04 13:26:22 -07:00
Greg Hackmann
4ba18cf3ff libziparchive: fix clang build
Bug: http://b/21558406
Change-Id: I69105a9cde05b182f65c7e574282bb4b48b66e95
Signed-off-by: Greg Hackmann <ghackmann@google.com>
(cherry picked from commit d6eac24aac)
2015-06-04 13:26:12 -07:00
Narayan Kamath
785a128aec Avoid mapping output to memory while writing to a file.
It's unnecessary, and causes issues when the uncompressed
output is large.

Bug: http://b/21558406
Change-Id: I99cfb3933b094c2826c7e6c6de9aab03478fcc53
(cherry picked from commit f899bd534b)
2015-06-04 13:25:52 -07:00
Mark Salyzyn
591195508b am 6f1457ad: logd: switch to unordered_map from BasicHashtable
* commit '6f1457adc58644f7c68829fd0872947bd7e63bfd':
  logd: switch to unordered_map from BasicHashtable
2015-06-04 19:08:51 +00:00
Mark Salyzyn
fa165ba4c2 am 1a9f875d: am 7ea9e8d2: Merge "logd: switch to unordered_map from BasicHashtable"
* commit '1a9f875d3c2de051a9a67392f4b134eceef34ac6':
  logd: switch to unordered_map from BasicHashtable
2015-06-04 19:00:31 +00:00
Rom Lemarchand
3c1bebf407 am f46dda96: am 4d2c1ee1: Merge "mkbootimg: misc typo fixes"
* commit 'f46dda96650a7d3e3791a6f4c034ce4d9f9e3f36':
  mkbootimg: misc typo fixes
2015-06-04 19:00:05 +00:00
Mark Salyzyn
1a9f875d3c am 7ea9e8d2: Merge "logd: switch to unordered_map from BasicHashtable"
* commit '7ea9e8d2662b54bc16f0c7a615c5ee650bf42ffa':
  logd: switch to unordered_map from BasicHashtable
2015-06-04 18:10:37 +00:00
Mark Salyzyn
6f1457adc5 logd: switch to unordered_map from BasicHashtable
(charry pick from commit 511338dd57)

BasicHashtable is relatively untested, move over to
a C++ template library that has more bake time.

Bug: 20419786
Bug: 21590652
Bug: 20500228
Change-Id: I926aaecdc8345eca75c08fdd561b0473504c5d95
2015-06-04 11:03:37 -07:00
Mark Salyzyn
7ea9e8d266 Merge "logd: switch to unordered_map from BasicHashtable" 2015-06-04 18:01:01 +00:00
Rom Lemarchand
f46dda9665 am 4d2c1ee1: Merge "mkbootimg: misc typo fixes"
* commit '4d2c1ee1411fecfedc47ff90c25b2729e7984195':
  mkbootimg: misc typo fixes
2015-06-04 17:09:15 +00:00
Rom Lemarchand
4d2c1ee141 Merge "mkbootimg: misc typo fixes" 2015-06-04 17:01:00 +00:00
Rom Lemarchand
a8221d3427 mkbootimg: misc typo fixes
- Fix whitespace in parse_int
- Use two dashes for kernel_offset instead of four

Change-Id: I59667da457d0f0d78a946e543d1aa0aec5e682d5
2015-06-04 09:59:01 -07:00
Mark Salyzyn
1f3507ac3a am 5d332907: liblog: logcat: Add printable format modifier
* commit '5d332907f0f845227847c31a122578dc910f1072':
  liblog: logcat: Add printable format modifier
2015-06-04 16:04:12 +00:00
Mark Salyzyn
8a5fe05531 am 3ae69bbe: am 79ae578e: Merge "liblog: logcat: Add printable format modifier"
* commit '3ae69bbe03e1992ef08578ec8597fdb7b871694a':
  liblog: logcat: Add printable format modifier
2015-06-04 15:56:14 +00:00
Mark Salyzyn
3ae69bbe03 am 79ae578e: Merge "liblog: logcat: Add printable format modifier"
* commit '79ae578eddaf0af5ef84ac7d71b3330d1a8c41ae':
  liblog: logcat: Add printable format modifier
2015-06-04 15:44:52 +00:00
Mark Salyzyn
5d332907f0 liblog: logcat: Add printable format modifier
(cherry pick from commit b932b2f8ba)

- added printable format modifier:
  logcat -v printable
- opencoded borrowed individual utf8 validity checking algorithm
  from utf8_length() in libutils/Unicode.cpp
- if considered basic one-character ASCII, use popular \x escape
  sequences for non-printable
- logprint convert to C comments to drop mixed-mode

Bug: 19000361
Change-Id: I122a5b8fb41216fc0bc816178c0b768f3df56586
2015-06-04 08:37:14 -07:00
Mark Salyzyn
79ae578edd Merge "liblog: logcat: Add printable format modifier" 2015-06-04 15:34:48 +00:00
Mark Salyzyn
b932b2f8ba liblog: logcat: Add printable format modifier
- added printable format modifier:
  logcat -v printable
- opencoded borrowed individual utf8 validity checking algorithm
  from utf8_length() in libutils/Unicode.cpp
- if considered basic one-character ASCII, use popular \x escape
  sequences for non-printable
- logprint convert to C comments to drop mixed-mode

Bug: 19000361
Change-Id: I122a5b8fb41216fc0bc816178c0b768f3df56586
2015-06-04 08:27:29 -07:00
Andres Morales
fc664a3aeb am b8216007: Merge "[gatekeeperd] track gk failure record changes" into mnc-dev
* commit 'b8216007c66a219de310830aaee05bf5a3d90466':
  [gatekeeperd] track gk failure record changes
2015-06-04 01:51:50 +00:00
Andres Morales
b8216007c6 Merge "[gatekeeperd] track gk failure record changes" into mnc-dev 2015-06-04 01:27:34 +00:00
Andres Morales
e1f827fc1f [gatekeeperd] track gk failure record changes
Bug:21118563
Change-Id: Ia726dc4db6ec5c6a1e8e08a689ec82568ff1e5aa
2015-06-03 18:24:36 -07:00
Elliott Hughes
5d725f9098 am f360bed8: am ecb6d564: Merge "Add a working Windows tmpfile(3) to fastboot."
* commit 'f360bed85182f1d8aba1f61793017600261d6247':
  Add a working Windows tmpfile(3) to fastboot.
2015-06-03 23:44:19 +00:00
Elliott Hughes
f360bed851 am ecb6d564: Merge "Add a working Windows tmpfile(3) to fastboot."
* commit 'ecb6d5648dd898ce61749fc4d59f38c373359bc7':
  Add a working Windows tmpfile(3) to fastboot.
2015-06-03 23:30:54 +00:00
Elliott Hughes
ecb6d5648d Merge "Add a working Windows tmpfile(3) to fastboot." 2015-06-03 23:21:02 +00:00
Elliott Hughes
a26fbeeaa4 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
2015-06-03 15:27:52 -07:00
Nick Kralevich
159e37e052 am 32512e71: tzdatacheck: don\'t hard code SELinux domain name
* commit '32512e716750b94c9e72c50a98a5db724857f1d5':
  tzdatacheck: don't hard code SELinux domain name
2015-06-03 21:07:14 +00:00
Nick Kralevich
e2722e9bfb am a20d6f4e: am 2ec88501: Merge "tzdatacheck: don\'t hard code SELinux domain name"
* commit 'a20d6f4e154939722263207ddf5954b3f58f666d':
  tzdatacheck: don't hard code SELinux domain name
2015-06-03 20:53:31 +00:00
Christopher Ferris
618981ad88 am 21bd040e: Change the 64 bit map address format.
* commit '21bd040effcfc48e8794558c91bbfdc159a98f00':
  Change the 64 bit map address format.
2015-06-03 20:41:26 +00:00
Nick Kralevich
a20d6f4e15 am 2ec88501: Merge "tzdatacheck: don\'t hard code SELinux domain name"
* commit '2ec8850167cd9c9c1939a810f4c9fd5acbef8191':
  tzdatacheck: don't hard code SELinux domain name
2015-06-03 20:40:56 +00:00
Nick Kralevich
32512e7167 tzdatacheck: don't hard code SELinux domain name
An automatic domain transition is already defined by SELinux
policy. Avoid having redundant information on the exec line.

This commit depends on commit 17fff893c0
which made the SELinux process label optional.

(cherrypicked from commit 221fca7ddd)

Change-Id: I89464f2bd218c7d6e8db08aa6bed2b62ec6dad2a
2015-06-03 13:36:24 -07:00
Nick Kralevich
2ec8850167 Merge "tzdatacheck: don't hard code SELinux domain name" 2015-06-03 20:30:23 +00:00
Nick Kralevich
221fca7ddd tzdatacheck: don't hard code SELinux domain name
An automatic domain transition is already defined by SELinux
policy. Avoid having redundant information on the exec line.

This commit depends on commit 17fff893c0
which made the SELinux process label optional.

Change-Id: I89464f2bd218c7d6e8db08aa6bed2b62ec6dad2a
2015-06-03 13:08:49 -07:00
Mark Salyzyn
511338dd57 logd: switch to unordered_map from BasicHashtable
BasicHashtable is relatively untested, move over to
a C++ template library that has more bake time.

Bug: 20419786
Bug: 21590652
Bug: 20500228
Change-Id: I926aaecdc8345eca75c08fdd561b0473504c5d95
2015-06-03 13:03:07 -07:00
Elliott Hughes
7f9a0962ef am 98ba6f11: am d3d32a1b: Merge "Fix file descriptor leak when opening invalid archives."
* commit '98ba6f1120c1bb4589cebaae20c3afe2ed3eefa2':
  Fix file descriptor leak when opening invalid archives.
2015-06-03 19:38:17 +00:00
Elliott Hughes
98ba6f1120 am d3d32a1b: Merge "Fix file descriptor leak when opening invalid archives."
* commit 'd3d32a1b13353002cd0ad121b4cb8d3b2a8cddca':
  Fix file descriptor leak when opening invalid archives.
2015-06-03 19:29:35 +00:00
Elliott Hughes
d3d32a1b13 Merge "Fix file descriptor leak when opening invalid archives." 2015-06-03 19:18:12 +00:00
Narayan Kamath
f6e9ffbc73 Fix file descriptor leak when opening invalid archives.
Also add -Wunreachable-code to the set of compiler flags, otherwise
noreturn becomes considerably less useful.

bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I9a95d45633c731c7046d4e4a39844d9cebfd1718
(cherrypick of 241bcf05e0e394bbf2681f359f52646dd6c707f6.)
2015-06-03 12:16:43 -07:00