Nick Kralevich
b470d404e5
am b988e95c: am 6fec3a23: Merge "Log a warning on services that lack SELinux domains."
...
* commit 'b988e95c10724fbf611602130c7881554cb5255d':
Log a warning on services that lack SELinux domains.
2013-12-10 17:54:01 +00: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
Sasha Levitskiy
2037a307a4
Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
...
Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-10 08:53:21 -08: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
Qiwen Zhao
d5d68f12f5
DO NOT MERGE reset to goog/klp-volantis-dev
2013-12-09 14:24:48 -08: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
6b3867fc6b
am 7d1f3a3d: am bdf53e2a: Merge "Do not change ownership on /sys/fs/selinux/enforce."
...
* commit '7d1f3a3daa721892b3247e847f72f1e948a0a68f':
Do not change ownership on /sys/fs/selinux/enforce.
2013-12-09 18:42:14 +00: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
Mark Salyzyn
5f64d528be
adb: regression from Move list.c to inlines
...
Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
2013-12-06 15:50:48 -08:00
Mark Salyzyn
9880128af2
Merge changes I7d9db1e2,I48b0942a,I0572555a
...
* changes:
liblog: whitespace cleanup
libsysutils: Get rid of warnings
libcutils: Move list.c to inlines on list.h
2013-12-06 19:12:28 +00:00
Mark Salyzyn
d33b5b7cdd
Merge "libcutils: bug str_parms.c:str_parms_get_float()."
2013-12-06 19:12:14 +00:00
Mark Salyzyn
ff4e3295ab
Merge "libcutils: UNUSED argument warnings"
2013-12-06 19:08:15 +00:00
Narayan Kamath
fe4d0a1065
am cb7092d9: am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."
...
* commit 'cb7092d9f602dcbe8c8c7b2eeec5858e1c35cc39':
Fix Mac OS build for libziparchive.
2013-12-06 18:37:12 +00: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
52d07d2056
am f591bbc2: am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."
...
* commit 'f591bbc247cf3535c8b5e162058769db4aa3d4af':
Unify zipfile implementations : Step 1.
2013-12-06 16:08:40 +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
1f9b04a304
am f02af525: am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD
...
* commit 'f02af525738583ca42a3cbfea00b868de7281aeb':
2013-12-06 01:38:40 +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
Todd Poynor
67ee1205b1
am 9bc73047: (-s ours) am 3f17bda8: am a41611f6: healthd: fix botched logging call
...
* commit '9bc73047b59cdff412cfc647018a69a69d36ae3d':
2013-12-05 22:45:53 +00:00
Elliott Hughes
30cd0fc4f6
am f183a42f: (-s ours) am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
...
* commit 'f183a42fb39f008c13e6ffdaa28766f8b78b43d3':
2013-12-05 22:45:53 +00:00
The Android Open Source Project
7fc7a07b23
Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD
2013-12-05 12:38:34 -08:00
Todd Poynor
9bc73047b5
am 3f17bda8: am a41611f6: healthd: fix botched logging call
...
* commit '3f17bda89498509fd56c3578ebff51ec0c2fb33f':
2013-12-05 19:46:58 +00:00
Elliott Hughes
f183a42fb3
am 49f2e1ce: am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
...
* commit '49f2e1cedfcf1dac72efe6e3634a3cd2db299e30':
Add USB Vendor ID for MSI
2013-12-05 19:46:12 +00:00
Mark Salyzyn
c1215c0b46
liblog: whitespace cleanup
...
- change cutils to liblog directory path
- change tabs to spaces
Change-Id: I7d9db1e2b817ba0ec9a224340c5c7535a2387fd5
2013-12-05 07:33:21 -08:00
Mark Salyzyn
8e71ddeac0
libcutils: bug str_parms.c:str_parms_get_float().
...
str_parms_get_float did not return the output into
*val. Only output if returning with no error. Audit
shows no internal users of this library function
Change-Id: I14a3f08a098072a159dd93f85ead36b3f445816f
2013-12-05 07:33:21 -08:00
Mark Salyzyn
ba02cd1e9b
libcutils: UNUSED argument warnings
...
Change-Id: Ie427d481298af8d911bb2b157ebba30954335354
2013-12-05 07:33:21 -08:00
Mark Salyzyn
696f267ff5
libsysutils: Get rid of warnings
...
- UNUSED argument warnings
- Remove LOG_NDEBUG define
Change-Id: I48b0942adfdb7a46a7693e580bc6ed5a685b0d5b
2013-12-05 07:33:21 -08:00
Mark Salyzyn
0ea3624b3e
libcutils: Move list.c to inlines on list.h
...
Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
2013-12-05 07:33:21 -08:00
Colin Cross
91a4160f5c
am 26321284: am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
...
* commit '263212845432865236b9b6ccdca807385603db68':
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-05 02:45:20 +00: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
Szymon Starzycki
4662a114a4
Revert "Revert "Fastbootd: flashing certification""
...
CMS functionality is now available
This reverts commit 068b71dd9c
.
Conflicts:
fastbootd/Android.mk
fastbootd/fastbootd.c
fastbootd/utils.c
fastbootd/utils.h
Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
2013-12-04 15:00:52 -08:00
Szymon Starzycki
27ea99fb99
Fastbootd: auto ssh server start
...
Change-Id: I3e9c53c3d834726c3747e9ee0665ed027f55b08c
2013-12-04 15:00:52 -08:00
Szymon Starzycki
bc849f1453
Fastbootd: network auto discovery
...
Change-Id: I91082f5832412e775244b3974c0ab00952905ad5
2013-12-04 15:00:52 -08:00
Szymon Starzycki
2a656c332b
Fastbootd: socket and network transport
...
Change-Id: I395e5361d0484bd11421225c152f9aec00305f11
2013-12-04 15:00:52 -08:00