Commit Graph

6829 Commits

Author SHA1 Message Date
Narayan Kamath 3a5ab80d0f am 7d92b7cc: Merge "Get rid of some log spam."
* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
  Get rid of some log spam.
2013-12-12 09:25:29 -08:00
Narayan Kamath 7d92b7cc65 Merge "Get rid of some log spam." 2013-12-12 17:19:40 +00:00
Narayan Kamath f6a196522a Get rid of some log spam.
We don't need a warning if an entry isn't found in a zip
file. It can happen as part of normal operation.

Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
2013-12-12 10:29:31 +00:00
Nick Kralevich af9e9d97ee am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
* commit 'f0a68b54be5ba78466a7075a6d9a72438c25e645':
  Minor cleanups.
2013-12-11 22:53:39 +00:00
Nick Kralevich f0a68b54be am 8779c4ea: Merge "Minor cleanups."
* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
  Minor cleanups.
2013-12-11 14:50:20 -08:00
Nick Kralevich 8779c4eab4 Merge "Minor cleanups." 2013-12-11 22:46:35 +00:00
Narayan Kamath bac8ae4d1d am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit '841ef3bd2081a74bf95be83211e92a653df61541':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 21:02:22 +00:00
Narayan Kamath 841ef3bd20 am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
* commit 'bcf1454cf6a2fadc30c5189c3756b3cb96149745':
  Use FileMap from libcutil instead of rolling our own.
2013-12-11 09:40:03 -08:00
Narayan Kamath bcf1454cf6 Merge "Use FileMap from libcutil instead of rolling our own." 2013-12-11 17:33:58 +00:00
Narayan Kamath eaf988532b Use FileMap from libcutil instead of rolling our own.
Adds windows support as a side effect.

Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
2013-12-11 15:17:06 +00:00
Todd Poynor 0af90f6f75 charger: dump pstore ram console DO NOT MERGE
Change-Id: I7f612d49418272e2ac867f64c10149ad616391cd
2013-12-10 21:58:34 +00:00
Nick Kralevich a91a47c30c am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
  Fix overflow in adb_client
2013-12-10 12:42:20 -08:00
Nick Kralevich b2dfa7ece7 am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
  Fix overflow in adb_client
2013-12-10 12:39:32 -08:00
Nick Kralevich 02d90b92ce am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
  Fix overflow in adb_client
2013-12-10 12:37:32 -08:00
Nick Kralevich 33e7f915d6 am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
  Fix overflow in adb_client
2013-12-10 12:31:17 -08:00
Nick Kralevich 54a80bcf88 am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
  Fix overflow in adb_client
2013-12-10 12:29:05 -08:00
Nick Kralevich cd072e94cf am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'ba104fb7f1f0acad99a0d3a1cf7153aab57ea450':
  Fix overflow in adb_client
2013-12-10 12:25:59 -08:00
Nick Kralevich ba104fb7f1 am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'e975716e36c9ad6aa80be2b54ee2cc63eadbdc44':
  Fix overflow in adb_client
2013-12-10 12:22:50 -08:00
Nick Kralevich e975716e36 am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
  Fix overflow in adb_client
2013-12-10 12:20:08 -08:00
Nick Kralevich 03d4eb2900 am d63fb078: am e89e09dd: Fix overflow in adb_client
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
  Fix overflow in adb_client
2013-12-10 12:17:45 -08:00
Nick Kralevich d63fb078ae am e89e09dd: Fix overflow in adb_client
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
  Fix overflow in adb_client
2013-12-10 12:14:44 -08:00
Nick Kralevich e89e09dd2b Fix overflow in adb_client
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
2013-12-10 10:18:10 -08:00
Marcus Oakland 6053564160 AArch64: Correction of struct surface_t
The struct in the union with GGLSurface in struct surface_t assumed
that the reserved field, which corresponds to the GGLsizei version
field in the GGLSurface structure (where GGLsizei is define as being
ssize_t in the system/core/include/pixelflinger/pixelflinger.h header
file) is uint32_t. That is appropriate to the 32-bit system but is
not appropriate to the 64-bit system, where ssize_t is 64-bits rather
than 32-bits.

The 32-bit system has also been tested and has no regression
because of this change.

Change-Id: I5cd84fd4a18fa0e63e27975f7b3d3e95b99cea58
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2013-12-10 18:13:26 +00:00
Ashok Bhat aed6bec414 libion: Use %zu for size_t
Change-Id: If92fc31ab676a569530c21e655a1b5b451f5c5e5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-10 18:13:04 +00:00
Narayan Kamath 44eb13570f am a183f45f: Merge "Add unit tests for libziparchive."
* commit 'a183f45f7aaee721a9c1cde14cdd47e47a1592e4':
  Add unit tests for libziparchive.
2013-12-10 09:58:08 -08:00
Narayan Kamath a183f45f7a Merge "Add unit tests for libziparchive." 2013-12-10 17:52:58 +00:00
Narayan Kamath 0c2e454cf4 am 404c5408: Merge "Fix return code for ended iteration."
* commit '404c5408a0be7cc42d3c1c4af4e87b7daed39862':
  Fix return code for ended iteration.
2013-12-10 09:49:40 -08:00
Nick Kralevich b988e95c10 am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."
* commit '6fec3a23046a3100c2ce1863afdd0191da69cdcc':
  Log a warning on services that lack SELinux domains.
2013-12-10 09:49:39 -08:00
Narayan Kamath 404c5408a0 Merge "Fix return code for ended iteration." 2013-12-10 17:46:14 +00:00
Narayan Kamath 58aaf46e4d Add unit tests for libziparchive.
- Add a build rule for host tests
- Add basic tests for Find / Iterate and Extract
  for both deflated & stored entries.
- Fix an off by one error that the test uncovered.

Change-Id: If72009b1ea9791d5a265829f05c32ffe1c2752c4
2013-12-10 16:48:50 +00:00
Nick Kralevich 6fec3a2304 Merge "Log a warning on services that lack SELinux domains." 2013-12-09 23:30:36 +00:00
Stephen Smalley af06c6745b Log a warning on services that lack SELinux domains.
Sample output on flo:
<3>[    7.270568] init: Warning!  Service irsc_util needs a SELinux domain defined; please fix!
<3>[    8.290832] init: Warning!  Service bootanim needs a SELinux domain defined; please fix!

Change-Id: If5514b188517917d58ee81c446af563b0443be45
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-09 15:40:24 -05:00
Nick Kralevich 7d1f3a3daa am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."
* commit 'bdf53e2a59654d2b1e8469616f1b0175b275219d':
  Do not change ownership on /sys/fs/selinux/enforce.
2013-12-09 10:35:41 -08:00
Nick Kralevich bdf53e2a59 Merge "Do not change ownership on /sys/fs/selinux/enforce." 2013-12-09 18:18:24 +00:00
Narayan Kamath eb41ad212e Fix return code for ended iteration.
The API promises a return code of -1 for an
ended iteration and lower negative values for
errors.

Change-Id: I688a1ee2efad1bdfc6959cf27e49c0426ebf27f8
2013-12-09 16:26:36 +00:00
Stephen Smalley 17bec835d5 Do not change ownership on /sys/fs/selinux/enforce.
There is no longer any reason to permit system UID to set enforcing mode.

Change-Id: Ie28beed1ca2b215c71f2847e2390cee1af1713c3
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-09 10:23:16 -05:00
Narayan Kamath cb7092d9f6 am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."
* commit '48a6d3de590714f4e913c6cc3135a455126df91d':
  Fix Mac OS build for libziparchive.
2013-12-06 10:33:39 -08:00
Narayan Kamath 48a6d3de59 am ac3ab308: Merge "Fix Mac OS build for libziparchive."
* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
  Fix Mac OS build for libziparchive.
2013-12-06 10:32:07 -08:00
Narayan Kamath ac3ab308f6 Merge "Fix Mac OS build for libziparchive." 2013-12-06 18:30:20 +00:00
Narayan Kamath 574c3b35df Fix Mac OS build for libziparchive.
BSD off_t are implicitly 64 bit so the platform
doesn't define off64_t.

Change-Id: I51cbe94ead01d2d6bc7c5010d9472487bee7c2d3
2013-12-06 18:27:53 +00:00
Narayan Kamath f591bbc247 am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit '51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c':
  Unify zipfile implementations : Step 1.
2013-12-06 05:39:41 -08:00
Narayan Kamath 51a1d4e3f6 am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8':
  Unify zipfile implementations : Step 1.
2013-12-06 05:37:39 -08:00
Narayan Kamath a2125077e1 Merge "Unify zipfile implementations : Step 1." 2013-12-06 13:35:17 +00:00
The Android Open Source Project f02af52573 am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD
* commit '7fc7a07b237e0887f3815822c4551b9968267b37':
2013-12-05 17:25:40 -08:00
The Android Open Source Project 7fc7a07b23 Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD 2013-12-05 12:38:34 -08:00
Colin Cross 2632128454 am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* commit '02ac0bfdc1c80a2f18487d28aa56dcd8499de246':
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-04 15:18:10 -08:00
Colin Cross 02ac0bfdc1 Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* changes:
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-04 23:11:55 +00:00
Elliott Hughes 9536b8c997 Fix fastbootd's <linux/kexec.h> reference.
Change-Id: I28ce0288a6377153a96d3a98d6913d1271e3112f
2013-12-04 15:00:52 -08:00
Szymon Starzycki baf4c4bdef Fastbootd: Comments and general cleaning
Alignment fix for fastbootd gpt_mmap

Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
2013-12-04 15:00:52 -08:00
Szymon Starzycki 55b61f4c9b Fastbootd: General fixes and changes
read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library

Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
2013-12-04 15:00:52 -08:00