Eino-Ville Talvala
c8b1ea7d77
am 919f3623: am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev
...
* commit '919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28':
Camera: Document expected error codes for start face detect.
2012-05-10 11:57:01 -07:00
Doug Zongker
5d38fd13d0
am e99ac6eb: am 4fd375b5: Merge "change /fstab.* perms to 0640" into jb-dev
...
* commit 'e99ac6eba3355e6574407f73c0a24f4aa7056d35':
change /fstab.* perms to 0640
2012-05-10 11:57:00 -07:00
Eino-Ville Talvala
919f3623e9
am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev
...
* commit '67fb73f5d5eaa089b63018f55f980631c9ba6749':
Camera: Document expected error codes for start face detect.
2012-05-10 10:45:23 -07:00
Doug Zongker
e99ac6eba3
am 4fd375b5: Merge "change /fstab.* perms to 0640" into jb-dev
...
* commit '4fd375b566f0a4536b0afd8a2e4bd1c573a082c9':
change /fstab.* perms to 0640
2012-05-10 10:45:07 -07:00
Eino-Ville Talvala
67fb73f5d5
Merge "Camera: Document expected error codes for start face detect." into jb-dev
2012-05-10 10:21:04 -07:00
Doug Zongker
4fd375b566
Merge "change /fstab.* perms to 0640" into jb-dev
2012-05-10 09:30:35 -07:00
Eino-Ville Talvala
58cfa8af0e
Camera: Document expected error codes for start face detect.
...
Clarify when BAD_VALUE is expected from the camera start face detect
command.
Bug: 6459066
Change-Id: Id1b3d5047dee2c509aa6e374a5ed439a776b0b87
2012-05-09 18:32:36 -07:00
Jamie Gennis
be9242bbef
am e4f1246b: am 011b502b: Merge "ANativeWindow: add set_post_transform_crop" into jb-dev
...
* commit 'e4f1246b444af07876968595754208236f817519':
ANativeWindow: add set_post_transform_crop
2012-05-09 12:56:14 -07:00
Jamie Gennis
e4f1246b44
am 011b502b: Merge "ANativeWindow: add set_post_transform_crop" into jb-dev
...
* commit '011b502b120b692ccbda140ed2cb3fe768c99eb0':
ANativeWindow: add set_post_transform_crop
2012-05-09 12:52:54 -07:00
Jamie Gennis
011b502b12
Merge "ANativeWindow: add set_post_transform_crop" into jb-dev
2012-05-09 12:51:04 -07:00
Jeff Brown
9d27fdce0a
am 33563c44: am 5b878d24: Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
...
* commit '33563c4482f0376b4bccb6fc0e5269742ac46e8b':
Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
2012-05-09 10:11:24 -07:00
Jeff Brown
f7ca908d44
am 82ebb158: am bff8f3fa: Add stubs for host builds.
...
* commit '82ebb1588158b7cc239a480356b3760c6d0451b2':
Add stubs for host builds.
2012-05-09 10:11:24 -07:00
Jeff Brown
e3a64bf6eb
am 2f70edf8: am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
...
* commit '2f70edf80ae906a114fdba46cd362708da25d543':
Revert "Use O_CLOEXEC when opening cgroup fds."
2012-05-09 10:11:21 -07:00
Jeff Brown
34a714b004
am 295afb36: am 6bdc0ca8: Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev
...
* commit '295afb36b5c2551243c73c607e245e30525a6942':
Use O_CLOEXEC when opening cgroup fds.
2012-05-09 10:11:20 -07:00
Jeff Brown
33563c4482
am 5b878d24: Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
...
* commit '5b878d24c1f01a5f131d470280b51bcfb5638600':
Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
2012-05-09 01:48:45 -07:00
Jeff Brown
82ebb15881
am bff8f3fa: Add stubs for host builds.
...
* commit 'bff8f3fa9848e52e3f3fe773796a03a80133992a':
Add stubs for host builds.
2012-05-09 01:48:45 -07:00
Jeff Brown
2f70edf80a
am 796a85e2: Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
...
* commit '796a85e24511b7926a1fccb7cc695900d3ce0922':
Revert "Use O_CLOEXEC when opening cgroup fds."
2012-05-09 01:48:25 -07:00
Jeff Brown
295afb36b5
am 6bdc0ca8: Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev
...
* commit '6bdc0ca86acd8a50de2df9433a195baefce2b3a7':
Use O_CLOEXEC when opening cgroup fds.
2012-05-09 01:48:08 -07:00
Jeff Brown
5b878d24c1
Revert "Revert "Use O_CLOEXEC when opening cgroup fds.""
...
This reverts commit 4df54bc4a8
2012-05-08 15:07:58 -07:00
Jeff Brown
bff8f3fa98
Add stubs for host builds.
...
Bug: 4466013
Change-Id: I5633c841e71a48357bb04cd7ccc02550c17bde22
2012-05-08 15:07:32 -07:00
Colin Cross
59c69efafb
am 40b2d79a: am 0e92b50f: Merge "libsuspend: create new library to handle triggering suspend" into jb-dev
...
* commit '40b2d79a40e9d38cb93fe0584f698cbe70e79ffb':
libsuspend: create new library to handle triggering suspend
2012-05-08 15:01:54 -07:00
Jeff Brown
796a85e245
Merge "Revert "Use O_CLOEXEC when opening cgroup fds."" into jb-dev
2012-05-08 14:59:31 -07:00
Jeff Brown
4df54bc4a8
Revert "Use O_CLOEXEC when opening cgroup fds."
...
This reverts commit e1440d81ae
2012-05-08 14:58:30 -07:00
Jeff Brown
6bdc0ca86a
Merge "Use O_CLOEXEC when opening cgroup fds." into jb-dev
2012-05-08 13:59:05 -07:00
Jeff Brown
e1440d81ae
Use O_CLOEXEC when opening cgroup fds.
...
Bug: 4466013
Change-Id: I0d2e915fc550a0ecaccad5e452dd4c87fc878b8b
2012-05-08 13:41:10 -07:00
Doug Zongker
0e6056d012
change /fstab.* perms to 0640
...
It's safe to change the permissions on files in the root partitions;
incremental OTA now knows how to handle this case.
This reverts commit 08c370cc50
2012-05-07 16:49:24 -07:00
Colin Cross
40b2d79a40
am 0e92b50f: Merge "libsuspend: create new library to handle triggering suspend" into jb-dev
...
* commit '0e92b50f0fb432c45b26863394e473916b0ab4ef':
libsuspend: create new library to handle triggering suspend
2012-05-07 16:02:14 -07:00
Colin Cross
0e92b50f0f
Merge "libsuspend: create new library to handle triggering suspend" into jb-dev
2012-05-07 16:00:19 -07:00
Colin Cross
a2582c2c4d
libsuspend: create new library to handle triggering suspend
...
libsuspend provides functions autosuspend_enable() and
autosuspend_disable() to trigger suspend on a variety of different
kernels.
Change-Id: I5dc28fb51532fa7c514330f1cfde7698d31d734c
2012-05-07 15:33:34 -07:00
Jamie Gennis
d21113ac46
ANativeWindow: add set_post_transform_crop
...
This change replaces the set_active_rect function with set_post_transform_crop.
There is a temporary set_active_rect function that calls
set_post_transform_crop for compatibility while commiting to multiple git
repositories.
Change-Id: Ia7c171186fd277d5a36f6068ace93a9ce1c82d28
2012-05-07 14:21:46 -07:00
Jean-Baptiste Queru
72292fddc1
am 2f1d4e2d: am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"
...
* commit '2f1d4e2d2d6d3d8969a6054778d0781766f33de7':
init: Fix chown and chmod for write-only files
2012-05-06 15:36:14 -07:00
Jean-Baptiste Queru
2f1d4e2d2d
am 254e0d49: am d98c87c9: Merge "init: Fix chown and chmod for write-only files"
...
* commit '254e0d496e11b30cd9e4f9324f3514be7e85f6d4':
init: Fix chown and chmod for write-only files
2012-05-06 15:32:47 -07:00
Jean-Baptiste Queru
254e0d496e
am d98c87c9: Merge "init: Fix chown and chmod for write-only files"
...
* commit 'd98c87c95342ed6eade9f1239122dc9e90dcad67':
init: Fix chown and chmod for write-only files
2012-05-06 15:29:18 -07:00
Jean-Baptiste Queru
d98c87c953
Merge "init: Fix chown and chmod for write-only files"
2012-05-06 08:08:43 -07:00
Doug Zongker
fc53f5ffe4
am f3772351: am a865f6d8: fix mkbootfs for systems that lack PATH_MAX
...
* commit 'f3772351e75ce7e7d117fc4e31bde0c243581316':
fix mkbootfs for systems that lack PATH_MAX
2012-05-04 17:01:36 -07:00
Doug Zongker
f3772351e7
am a865f6d8: fix mkbootfs for systems that lack PATH_MAX
...
* commit 'a865f6d85a52d0a77d1aef8d5fb5bece08e3b246':
fix mkbootfs for systems that lack PATH_MAX
2012-05-04 17:00:01 -07:00
Doug Zongker
a865f6d85a
fix mkbootfs for systems that lack PATH_MAX
...
Change-Id: I1b841bde6de6c8e762c5fba35e6d6d701f18bb05
2012-05-04 16:45:35 -07:00
Doug Zongker
4d86de7f7a
am 4d755a1b: am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
...
* commit '4d755a1b37f44ec935b06bbc921d128272e9ee96':
add -f option to mkbootfs to load file perms from file
2012-05-04 16:36:38 -07:00
Doug Zongker
4d755a1b37
am 0375fd13: Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
...
* commit '0375fd133a95f47d0ea12b16ca3d7ccf04ea6362':
add -f option to mkbootfs to load file perms from file
2012-05-04 16:31:57 -07:00
Doug Zongker
0375fd133a
Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
2012-05-04 16:29:45 -07:00
Benoit Goby
93574c619c
init: Fix chown and chmod for write-only files
...
Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af
2012-05-04 16:29:41 -07:00
Doug Zongker
f2c3a8331c
add -f option to mkbootfs to load file perms from file
...
mkbootfs uses the compiled in fs_config() function to set the mode
(but not the uid or gid) of the files in the filesystem it is
building. Give it an optional "-f filename" flag to allow loading the
list of file permissions from a file, so we can continue to accurately
recreate old filesystems even when the current fs_config() has changed.
Bug: 6435132
Change-Id: Ife6b25e989301e78e22c34a544738436c96caf6f
2012-05-04 16:00:23 -07:00
Elliott Hughes
96a3d2792a
am 34d85c5e: am f82e7411: Make a liblog.so for the host too.
...
* commit '34d85c5e6cdf3c99b4d46a6036066743799bff0d':
Make a liblog.so for the host too.
2012-05-03 18:53:25 -07:00
Elliott Hughes
34d85c5e6c
am f82e7411: Make a liblog.so for the host too.
...
* commit 'f82e74116314c4def32013495337c038f6c6ee6c':
Make a liblog.so for the host too.
2012-05-03 16:36:13 -07:00
Elliott Hughes
f82e741163
Make a liblog.so for the host too.
...
Change-Id: I0317bb3b80c6555bcb1ff9f2238f32be5f7adedb
Conflicts:
liblog/Android.mk
2012-05-03 16:04:57 -07:00
Doug Zongker
27843a2a66
am e8b2e618: am 08c370cc: change /fstab.* perms back to 0644, to unbreak incremental OTAs
...
* commit 'e8b2e6185c46e51ad90091cf26ccdf8e2fac4138':
change /fstab.* perms back to 0644, to unbreak incremental OTAs
2012-05-03 14:24:47 -07:00
Doug Zongker
e8b2e6185c
am 08c370cc: change /fstab.* perms back to 0644, to unbreak incremental OTAs
...
* commit '08c370cc50e4bdae5a59f4ddfd1e3874bb36579d':
change /fstab.* perms back to 0644, to unbreak incremental OTAs
2012-05-03 14:21:33 -07:00
Doug Zongker
08c370cc50
change /fstab.* perms back to 0644, to unbreak incremental OTAs
...
Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84
2012-05-03 14:16:54 -07:00
Jeff Sharkey
6ea936b7f4
am 8f1d4daf: am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev
...
* commit '8f1d4daffd46c122501d22dda864ce6f209657b1':
Support full 32 bits for socket tags.
2012-05-02 19:40:54 -07:00
Jeff Sharkey
8f1d4daffd
am 982fd17a: Merge "Support full 32 bits for socket tags." into jb-dev
...
* commit '982fd17ac179787ca5f7a7ece03234629285850f':
Support full 32 bits for socket tags.
2012-05-02 19:39:44 -07:00
