Commit graph

6485 commits

Author SHA1 Message Date
jp abgrall
01b5618347 am 8f4c14f1: am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"
* commit '8f4c14f1e7fd0a2f9b46151ccc83c49b41e830ef':
  cutils: list: add list_for_each_safe
2013-09-25 11:37:46 -07:00
jp abgrall
8f4c14f1e7 am 08170103: am 91962669: Merge "cutils: list: add list_for_each_safe"
* commit '0817010366feecb53fc70719b3784dd7c6d66b55':
  cutils: list: add list_for_each_safe
2013-09-25 11:36:02 -07:00
jp abgrall
0817010366 am 91962669: Merge "cutils: list: add list_for_each_safe"
* commit '919626693999d8d3f22e12477d35c067594a6387':
  cutils: list: add list_for_each_safe
2013-09-25 11:34:29 -07:00
jp abgrall
9196266939 Merge "cutils: list: add list_for_each_safe" 2013-09-25 18:31:44 +00:00
Kenny Root
25deadbe02 am 7d343236: am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit '7d343236f34dbc2ee2771d3e42f881019ec1aa6a':
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 09:39:52 -07:00
Kenny Root
7d343236f3 am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit '6d06b01cf4237bd43b6e13f1683fcfc4dae83e78':
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 09:36:50 -07:00
Kenny Root
6d06b01cf4 am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit 'e245b8fb5d3d5b3fe23cbc82ba79c6caaee901f2':
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 09:33:57 -07:00
Kenny Root
e245b8fb5d Merge changes I9f858204,Ib35643b3
* changes:
  mincrypt: merge the two RSA verifiers
  mincrypt: support SHA-256 hash algorithm
2013-09-25 16:31:44 +00:00
Doug Zongker
0a862dcd63 mincrypt: merge the two RSA verifiers
The e=3 and e=65537 implementations are nearly identical, refactor
them down into one.

(cherry picked from commit 8fdbf97652)

Change-Id: I9f858204d52a0ae880170d955bf8f29fed57ee94
2013-09-25 09:26:51 -07:00
Doug Zongker
8e5b63d045 mincrypt: support SHA-256 hash algorithm
- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
  or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
  specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

(cherry picked from commit 515e1639ef)

Change-Id: Ib35643b3d864742e817ac6e725499b451e45afcf
2013-09-25 09:26:34 -07:00
Benoit Goby
adb88e20e4 am 4820022b: am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit '4820022b5edb0d19e268d836c25aa628b4378aba':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:18:09 -07:00
Benoit Goby
4820022b5e am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit '0b7d588d531691904530ba57d772b31fb24ed343':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:15:43 -07:00
Benoit Goby
0b7d588d53 am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit 'f2c4c4ada725b86e6581a89cc06e2836d4bdc6e3':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:13:17 -07:00
Benoit Goby
f2c4c4ada7 Merge "init: Fix queue_all_property_triggers with nonexistent properties" 2013-09-24 23:10:44 +00:00
Ben Cheng
90f143328f am bcea352d: am d38cc182: Merge "Disable timestamp logging." into klp-dev
* commit 'bcea352d2ce59c98414d15cb38f16d4c1abe2b72':
  Disable timestamp logging.
2013-09-24 15:47:31 -07:00
Ben Cheng
bcea352d2c am d38cc182: Merge "Disable timestamp logging." into klp-dev
* commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01':
  Disable timestamp logging.
2013-09-24 15:44:12 -07:00
Ben Cheng
d38cc182db Merge "Disable timestamp logging." into klp-dev 2013-09-24 22:39:11 +00:00
Benoit Goby
d679e1b572 init: Fix queue_all_property_triggers with nonexistent properties
Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

    init: property 'sys.powerctl' doesn't exist while
    expanding '${sys.powerctl}'
    init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
2013-09-24 15:20:34 -07:00
Rom Lemarchand
87b3c6af08 am b5ffaded: am 397a3642: fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
* commit 'b5ffadedd48a3e9a5e302925a87eeec47ac00dbe':
  fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
2013-09-24 11:00:38 -07:00
Rom Lemarchand
b5ffadedd4 am 397a3642: fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
* commit '397a3642145dbd0919f8148ff24f0cafe1714b55':
  fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
2013-09-24 10:57:33 -07:00
Rom Lemarchand
397a364214 fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
Make sure fstab is not NULL before freeing it

Bug: 10911605
Change-Id: I549c0a470dd183fb15a2f3c5cf4f3dd393b6e307
2013-09-24 10:49:46 -07:00
Ken Sumrall
6314401946 am dfcbf02b: am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
* commit 'dfcbf02bb0a6705e3714a59e42e052fbb0ce8799':
  Create a separate copy of the fsck logs
2013-09-24 10:25:31 -07:00
Ken Sumrall
dbbafa5307 am 12d71925: am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
* commit '12d71925862c9268a06c4a9bbf0904f22e1c5323':
  New fstab flags to support more expressive SD card permissions
2013-09-24 10:25:21 -07:00
Ben Cheng
5cd118178e Disable timestamp logging.
The kernel problem has been fixed long time ago and the ad-hoc logging
mechanism is not thread safe and can flood the log with spurious
messages.

BUG: 10899829
Change-Id: I63278db51295e744eed3e47dc8d4cfe621c0d8f7
2013-09-23 22:39:15 -07:00
Ken Sumrall
dfcbf02bb0 am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
* commit '6b1a027239689a817aa5ca44a2bcbfe48ed21408':
  Create a separate copy of the fsck logs
2013-09-23 18:59:39 -07:00
Ken Sumrall
12d7192586 am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
  New fstab flags to support more expressive SD card permissions
2013-09-23 18:59:39 -07:00
Glenn Kasten
3707e7ff03 toolbox: Add nohup command
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-09-23 15:37:55 -07:00
Ken Sumrall
6b1a027239 Merge "Create a separate copy of the fsck logs" into klp-dev 2013-09-23 20:06:57 +00:00
Ken Sumrall
777a00e3d1 Merge "New fstab flags to support more expressive SD card permissions" into klp-dev 2013-09-23 20:06:41 +00:00
Todd Poynor
4676550b56 init.rc: use oom_score_adj instead of oom_adj
Use kernel oom_score_adj interface to make init and children unkillable.

Stop using older, deprecated oom_adj interface.

Use OOM_SCORE_ADJ_MIN to make the processes unkillable (previously the processes
were set to a very low score, but not unkillable).

Change-Id: I680965009585c2a5a580859fb946f2d0caa95d9c
2013-09-23 18:32:36 +00:00
Todd Poynor
16b6099476 low memory killer: switch to kernel oom_score_adj interface
Use oom_score_adj for setting OOM score adjustment values instead
of the older, deprecated oom_adj interface.

Change-Id: I5ba7801d4b8971be092b31ae0fd8af8c3001d613
2013-09-23 18:32:02 +00:00
Jeff Sharkey
cae02657be am 500f3ffa: am 0ee7d8c6: Fix Mac builds, for realz.
* commit '500f3ffad43d115faad38f4ed2c32a08b694f183':
  Fix Mac builds, for realz.
2013-09-20 18:06:46 -07:00
Jeff Sharkey
500f3ffad4 am 0ee7d8c6: Fix Mac builds, for realz.
* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
  Fix Mac builds, for realz.
2013-09-20 18:04:53 -07:00
Jeff Sharkey
0ee7d8c68b Fix Mac builds, for realz.
Change-Id: I63e21b90e5b8a8f016dd04ceca4354793faa5e37
2013-09-20 18:00:15 -07:00
Ken Sumrall
4eaf905858 Create a separate copy of the fsck logs
The log_target parameter of android_fork_execvp_ext() is now a
bit field, and multiple targets can be set to log to multiple
places at the same time.

The new target LOG_FILE will log to a file specified by the new
parameter file_path.

Set LOG_FILE and log to a file in /dev (the only writable filesystem
avilable when e2fsck runs) when invoking e2fsck in fs_mgr.

Bug: 10021342

Change-Id: I63baf644cc8c3afccc8345df27a74203b44d0400
2013-09-20 17:44:33 -07:00
Ken Sumrall
887f289206 New fstab flags to support more expressive SD card permissions
Bug: 10330128

Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
2013-09-20 17:43:52 -07:00
Jeff Sharkey
7e82a37327 am 68955fc8: am 4481c325: Fix Mac builds.
* commit '68955fc82edc2b4a3b61712a9fb9c80a705ba4c0':
  Fix Mac builds.
2013-09-20 17:41:52 -07:00
Jeff Sharkey
68955fc82e am 4481c325: Fix Mac builds.
* commit '4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e':
  Fix Mac builds.
2013-09-20 17:39:27 -07:00
Jeff Sharkey
4481c325b1 Fix Mac builds.
Change-Id: I0eb029395a3afd2f93a7632d7d3d20d28c2ab189
2013-09-20 17:35:15 -07:00
Jeff Sharkey
aa4a3228f0 am 9729b415: am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.
* commit '9729b41574ca5e5e87c86b203a2096cbdc72cfea':
  Remove mkdir() side effect, add .nomedia, utils.
2013-09-20 15:59:37 -07:00
Jeff Sharkey
9729b41574 am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.
* commit '44d6342caa0db1f613809e9ba1ea8d9af0183b74':
  Remove mkdir() side effect, add .nomedia, utils.
2013-09-20 15:57:58 -07:00
Jeff Sharkey
44d6342caa Remove mkdir() side effect, add .nomedia, utils.
Before this change, FUSE lookup() would have the side effect of
creating the directory on behalf of apps.  This resulted in most
directories being created just by Settings trying to measure disk
space.  Instead, we're switching to have vold do directory creation
when an app doesn't have enough permissions.

Create fs_mkdirs() utility to create all parent directories in a
path as needed.  Allow traversal (+x) into /storage directories.

Fix FUSE derived permissions to be case insensitive.  Mark well-known
directories as .nomedia when created.

Bug: 10577808, 10330221
Change-Id: I53114f2e63ffbe6de4ba6a72d94a232523231cad
2013-09-20 14:21:09 -07:00
Kenny Root
780e011f09 Merge "Remove UniquePtr.h copy" 2013-09-20 20:45:45 +00:00
Ying Wang
cf14eb59a5 Merge "Install the nonexistent-source symlink as a post-install step" 2013-09-20 18:14:03 +00:00
Kenny Root
d975f37294 Remove UniquePtr.h copy
This was copied from libcore/include quite a while ago, but the
canonical version has since moved out to a generic library called
libnativehelper. All users of this header should already have
libnativehelper on their include path, so switching to the canonical
version is as easy as removing the "utils/" part.

Change-Id: Iae8e59bf3eee573bfa78381866989934e5bbf19d
2013-09-20 10:47:08 -07:00
Ying Wang
c4d6ade839 Install the nonexistent-source symlink as a post-install step
Previously because /sbin/healthd does not exist on the build host, make
always tries to rebuild the symlink even in an already-up-to-date tree.

Change-Id: I41201282281476b14eaf4c7d9b2e09fe367c1422
2013-09-20 10:37:42 -07:00
Elliott Hughes
3aed2cf04f Merge "Remove a homebrew mmap64." 2013-09-20 17:20:45 +00:00
Elliott Hughes
8202157062 Remove a homebrew mmap64.
This should have been fixed in bionic, and now has been.

Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
2013-09-20 10:18:21 -07:00
Elliott Hughes
60549075e8 am 4d5d633b: am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '4d5d633bf862dbb0a960019e80fadc40c93177f0':
  libsparse: Use BIONIC implementation of mmap64()
2013-09-20 09:58:54 -07:00
Elliott Hughes
4d5d633bf8 am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '20eb7ac26435abb1b2514951eee07fee44773877':
  libsparse: Use BIONIC implementation of mmap64()
2013-09-19 14:30:57 -07:00