Ruben Brunk
84a95225d6
Merge "camera3: Add opaque raw format."
2014-02-07 01:56:08 +00:00
Nick Kralevich
b3e2d02588
am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit '52ca10d15aa803333467db456a40d2bbc89dc18e':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-07 00:02:23 +00:00
Nick Kralevich
52ca10d15a
am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit 'e3b1810e7e15a12512beb285a83a65a803d55366':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-06 23:56:10 +00:00
Nick Kralevich
e3b1810e7e
am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit '71de56a08cac3353334c2253748fdf8c37ec4aa1':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-06 23:48:52 +00:00
Nick Kralevich
71de56a08c
Merge "Unify toolbox restorecon and libselinux restorecon implementations."
2014-02-06 23:43:59 +00:00
Ruben Brunk
535253eabe
camera3: Add opaque raw format.
...
Change-Id: I7abf0e63a0f74ede46e0fe4dd1285283355624b1
2014-02-06 11:32:23 -08:00
Stephen Smalley
2761b71d3f
Unify toolbox restorecon and libselinux restorecon implementations.
...
Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command. This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions. Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).
Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-06 09:42:04 -05:00
Elliott Hughes
260d400593
am b30b159f: am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."
...
* commit 'b30b159f709a94a0fb1d62aa1ed7b0da8a51120d':
system/core LP64 cleanup.
2014-02-06 03:07:48 +00:00
Elliott Hughes
b30b159f70
am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."
...
* commit '61e92a026472786ce81f4738e7d77bcad69697b8':
system/core LP64 cleanup.
2014-02-06 03:03:52 +00:00
Elliott Hughes
61e92a0264
am 68835ee8: Merge "system/core LP64 cleanup."
...
* commit '68835ee88b146f654fe3ce007f07ace71266e876':
system/core LP64 cleanup.
2014-02-06 02:59:38 +00:00
Elliott Hughes
68835ee88b
Merge "system/core LP64 cleanup."
2014-02-06 02:12:05 +00:00
Elliott Hughes
5d9fe779c8
system/core LP64 cleanup.
...
Fixes -Wint-to-pointer and -Wpointer-to-int warnings, plus various -Wformat
warnings.
Change-Id: I6c5eea6b4273d82d28b8e5d2925f3e5457511b17
2014-02-05 18:02:11 -08:00
Elliott Hughes
99be1a480e
am c7cb88f1: (-s ours) am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""
...
* commit 'c7cb88f1677fcee87ebe09054cb7f217de33626e':
Revert "Move to the canonical UniquePtr.h."
2014-02-05 00:03:47 +00:00
Elliott Hughes
c7cb88f167
am afdd1915: am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""
...
* commit 'afdd1915f6f7fd4ea941daac20ba234e981ef376':
Revert "Move to the canonical UniquePtr.h."
2014-02-04 23:50:38 +00:00
Elliott Hughes
afdd1915f6
am eaba2bed: Merge "Revert "Move to the canonical UniquePtr.h.""
...
* commit 'eaba2bedf529eeb21351c8bf6365107cb6a4e8b6':
Revert "Move to the canonical UniquePtr.h."
2014-02-04 23:46:14 +00:00
Elliott Hughes
d30eface6d
am 4e9d3ce2: (-s ours) am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."
...
* commit '4e9d3ce295ea57cf92d734617a6d0947d0fb7aa4':
Move to the canonical UniquePtr.h.
2014-02-04 23:42:06 +00:00
Elliott Hughes
eaba2bedf5
Merge "Revert "Move to the canonical UniquePtr.h.""
2014-02-04 23:41:58 +00:00
Elliott Hughes
5c4020005b
Revert "Move to the canonical UniquePtr.h."
...
This reverts commit 2a72c575d2
.
Change-Id: Idb485f1be2906e8c1c8f0da3df186a7aade027f6
2014-02-04 23:41:22 +00:00
Elliott Hughes
4e9d3ce295
am 0056a41d: am 345fc625: Merge "Move to the canonical UniquePtr.h."
...
* commit '0056a41d2a1ffd75644451b54e4ccacbbba75a5c':
Move to the canonical UniquePtr.h.
2014-02-04 23:23:51 +00:00
Elliott Hughes
0056a41d2a
am 345fc625: Merge "Move to the canonical UniquePtr.h."
...
* commit '345fc6252a3e5c6113be893638f4746a54173489':
Move to the canonical UniquePtr.h.
2014-02-04 23:20:06 +00:00
Elliott Hughes
345fc6252a
Merge "Move to the canonical UniquePtr.h."
2014-02-04 23:15:52 +00:00
Doug Zongker
6edd1bdf53
Merge "set permissions of recovery install script"
2014-02-04 22:01:29 +00:00
Doug Zongker
9526202d84
set permissions of recovery install script
...
The script that writes the recovery partition after a successful
update of system needs to be made executable. This change also moves
it from /system/etc to /system/bin.
Bug: 12893978
Change-Id: I686e2392a2392515a6859a7381b735de1007b7ea
2014-02-04 12:33:08 -08:00
Elliott Hughes
2a72c575d2
Move to the canonical UniquePtr.h.
...
Change-Id: I5330c36d2b571acb6d3debd30b8020e33aa8a4a7
2014-02-04 11:58:51 -08:00
Mark Salyzyn
6694b7508a
am 925a3cd9: am ddf872c0: am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"
...
* commit '925a3cd95a54c8955df0c8e6e2774819598e7917':
libsysutil: frequent native crash /system/bin/vold
2014-02-04 19:28:50 +00:00
Mark Salyzyn
925a3cd95a
am ddf872c0: am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"
...
* commit 'ddf872c0fb3e2a9cf9bfb197842d9bb4ccc164cd':
libsysutil: frequent native crash /system/bin/vold
2014-02-04 19:26:38 +00:00
Mark Salyzyn
ddf872c0fb
am 5931ea86: Merge "libsysutil: frequent native crash /system/bin/vold"
...
* commit '5931ea864599fc3ce29ed3b1ff8d4ff65413a168':
libsysutil: frequent native crash /system/bin/vold
2014-02-04 19:24:20 +00:00
Mark Salyzyn
5931ea8645
Merge "libsysutil: frequent native crash /system/bin/vold"
2014-02-04 19:16:28 +00:00
Nick Kralevich
d9d8a60e42
am fbca9d94: am 7e3d72d9: am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
...
* commit 'fbca9d9449231839b805ef4b11e4b2d968e601e3':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 19:02:48 +00:00
Nick Kralevich
fbca9d9449
am 7e3d72d9: am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
...
* commit '7e3d72d974d21932c2a6a0323c59fed2f689d323':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 18:43:06 +00:00
Nick Kralevich
7e3d72d974
am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
...
* commit 'ba023b063d25b73923f2df536b6258967f756ff6':
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 18:37:36 +00:00
Nick Kralevich
ba023b063d
Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
2014-02-04 18:31:51 +00:00
Glenn Kasten
5a23144aa5
Merge "Add 24-bit packed to audio_format_t"
2014-02-03 23:31:55 +00:00
Christopher Ferris
a3fe7a7927
am 10c2607c: am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."
...
* commit '10c2607c3cc4903ca8dcbe2245f66d21af199865':
Call a specialized local map set.
2014-02-03 17:00:01 +00:00
Christopher Ferris
1ffde8abbe
am 2765ec14: am f355750d: am c47aa3bd: Merge "Fix mips build."
...
* commit '2765ec143440a0fffd3358d1dc6f7fcf893b2b01':
Fix mips build.
2014-02-03 17:00:00 +00:00
Elliott Hughes
32b3697946
am f51bee45: am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
...
* commit 'f51bee45b015730b5f2759e89882c0cb457c22a3':
Fix debuggerd's symbol offset output.
2014-02-03 16:59:59 +00:00
Christopher Ferris
10c2607c3c
am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."
...
* commit '77b230233178e853dccfe9ca0ee52c78e2a2579b':
Call a specialized local map set.
2014-02-03 00:47:37 +00:00
Christopher Ferris
2765ec1434
am f355750d: am c47aa3bd: Merge "Fix mips build."
...
* commit 'f355750defa34d2e28d51a220947fea59c4f4429':
Fix mips build.
2014-02-03 00:47:36 +00:00
Elliott Hughes
f51bee45b0
am 784b6181: am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
...
* commit '784b6181cfd2a0362f35d32ee62a98ab60437397':
Fix debuggerd's symbol offset output.
2014-02-03 00:47:36 +00:00
Christopher Ferris
77b2302331
am 3faf86c0: Merge "Call a specialized local map set."
...
* commit '3faf86c0d4b98e7d26edbe8d1c8a8a231c86a234':
Call a specialized local map set.
2014-02-03 00:45:02 +00:00
Christopher Ferris
f355750def
am c47aa3bd: Merge "Fix mips build."
...
* commit 'c47aa3bd2acde49f858b21bcafd750b2981df7c0':
Fix mips build.
2014-02-03 00:45:02 +00:00
Elliott Hughes
784b6181cf
am cf53e5db: Merge "Fix debuggerd\'s symbol offset output."
...
* commit 'cf53e5dbdfa06a16104f4ffa03aeeb538fbd1509':
Fix debuggerd's symbol offset output.
2014-02-03 00:45:01 +00:00
Christopher Ferris
3faf86c0d4
Merge "Call a specialized local map set."
2014-02-01 22:18:02 +00:00
Christopher Ferris
c47aa3bd2a
Merge "Fix mips build."
2014-02-01 22:13:17 +00:00
Christopher Ferris
c53c47364f
Fix mips build.
...
Change-Id: I5401ae6ca6553ebbec231166820c1c904355ec63
2014-02-01 12:23:03 -08:00
Christopher Ferris
73dc1cc3fb
Call a specialized local map set.
...
Bug: 12852152
Change-Id: I8a0c558bc218805b0e06371af0af055e4aa6e0bb
2014-02-01 11:53:33 -08:00
Elliott Hughes
cf53e5dbdf
Merge "Fix debuggerd's symbol offset output."
2014-02-01 07:48:24 +00:00
Elliott Hughes
f7b4b519e4
Fix debuggerd's symbol offset output.
...
Before:
00007fff33e489d8 00007ff286e4ad94 /system/lib64/libc.so (__libc_init+54u)
After:
00007fff45c6c158 00007f61bc36fd94 /system/lib64/libc.so (__libc_init+84)
Change-Id: I36796c99843a41583824a96793a5a4c81ddb666e
2014-01-31 23:13:55 -08:00
Elliott Hughes
6cfb31d652
am 5cbb68cf: am da9b5dab: am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."
...
* commit '5cbb68cf891fa040563c70784363496cf3e05174':
LP64 should have debuggerd and debuggerd64.
2014-02-01 01:39:18 +00:00
Elliott Hughes
5cbb68cf89
am da9b5dab: am 434edbe6: Merge "LP64 should have debuggerd and debuggerd64."
...
* commit 'da9b5dab2d565f9682fe1fb3555702bf82334ab4':
LP64 should have debuggerd and debuggerd64.
2014-02-01 01:36:59 +00:00