Commit Graph

10670 Commits

Author SHA1 Message Date
Paul Lawrence ad5b54aa64 am a95e10fe: am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev
* commit 'a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d':
  Enable not rebooting during default encryption
2014-08-26 10:07:27 +00:00
Paul Lawrence a95e10fe31 am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev
* commit 'a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8':
  Enable not rebooting during default encryption
2014-08-26 04:53:43 +00:00
Dmitriy Ivanov ec865a6c48 am 64362fd2: am 1ee7e520: am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
* commit '64362fd2d853cfcc971759afee68e2ec66f5bb0e':
  Fix typo: ifndef -> ifneq
2014-08-26 00:43:30 +00:00
Dmitriy Ivanov 64362fd2d8 am 1ee7e520: am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
* commit '1ee7e520e2ada9eb6f87f33e1b6d405070bdbd15':
  Fix typo: ifndef -> ifneq
2014-08-26 00:34:55 +00:00
Dmitriy Ivanov 1ee7e520e2 am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
* commit 'ec7cc9326e545f8ad32e03d2416e04850bdd454b':
  Fix typo: ifndef -> ifneq
2014-08-26 00:25:20 +00:00
Dmitriy Ivanov ec7cc9326e Merge "Fix typo: ifndef -> ifneq" 2014-08-25 23:29:20 +00:00
Dmitriy Ivanov 85af05ae37 Fix typo: ifndef -> ifneq
Change-Id: Id71c70b6fcd2659078a19cc652fd02807372f3a0
2014-08-25 16:26:29 -07:00
Paul Lawrence a005e7795e Merge "Enable not rebooting during default encryption" into lmp-dev 2014-08-25 20:28:36 +00:00
Paul Lawrence c23074f386 Enable not rebooting during default encryption
Need to not set this property) during mount, since it can't
be changed later (ro property)

Also no reason to start class main on encryption cycle - we'll
show surfaceflinger, which is enough UI for this short cycle.

Bug: 17041092
Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed
2014-08-25 19:24:10 +00:00
Kenny Root a600288b17 am c6c8b563: am cf2b944d: am 5a1d5a8c: Merge "ueventd: call _exit for safety"
* commit 'c6c8b563e60adf94d5576567245ee4d30dabb137':
  ueventd: call _exit for safety
2014-08-25 18:13:02 +00:00
Kenny Root c6c8b563e6 am cf2b944d: am 5a1d5a8c: Merge "ueventd: call _exit for safety"
* commit 'cf2b944df6d744d279a434ec280f9bd8cef03a5b':
  ueventd: call _exit for safety
2014-08-25 18:03:27 +00:00
Kenny Root cf2b944df6 am 5a1d5a8c: Merge "ueventd: call _exit for safety"
* commit '5a1d5a8c79d0148291700cc5773a1519f2c6d8eb':
  ueventd: call _exit for safety
2014-08-25 17:16:00 +00:00
Kenny Root 5a1d5a8c79 Merge "ueventd: call _exit for safety" 2014-08-25 17:05:37 +00:00
Kenny Root 17baff480a ueventd: call _exit for safety
Make sure to call _exit instead of exit to avoid triggering exit
handlers that may have existed in the parent process.

Print out a log message when forking to process firmware events fails.

Change-Id: I2436bdf85d9a8ea26b718e62023f1dac89864667
2014-08-25 10:05:08 -07:00
Elliott Hughes 0896bb9934 am a024c2e7: am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
* commit 'a024c2e770f91407b61f1d5e27a2b14ffaeaee6f':
  Add BSD false(1) and true(1).
2014-08-25 08:24:35 +00:00
Elliott Hughes a024c2e770 am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
* commit 'b48c46bcc2986ccb0a2bcac5549285537d8d9d1a':
  Add BSD false(1) and true(1).
2014-08-24 08:57:39 +00:00
Elliott Hughes b48c46bcc2 am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
* commit '3cebf9f8c37262ba8c1ec8fcaa7083a6f8d82b77':
  Add BSD false(1) and true(1).
2014-08-24 05:28:32 +00:00
Elliott Hughes 3cebf9f8c3 Merge "Add BSD false(1) and true(1)." 2014-08-24 02:54:32 +00:00
Elliott Hughes 50221f5837 Add BSD false(1) and true(1).
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
leozwang 0f1fda9ee8 Fix build on mac.
On mac require a case.
Also, this code is not portable, will fix it in long run.

Change-Id: I76194b62cea29bd3d21c7ba6c3da4d549bea4738
2014-08-22 22:37:18 +00:00
leozwang adb09fa01a Add more debug information.
Re-commit https://googleplex-android-review.googlesource.com/#/c/519430/
Add fix for win_sdk build.

Add socketpair debug log.
Also output thread information in log on host side.

Change-Id: I21021bc111a3f7362a91b70593e3738125878118
2014-08-22 16:11:58 +00:00
Calin Juravle 541a7d796a am 29d787b5: am 100386a9: (-s ours) am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
* commit '29d787b589446b8eb2327899812375adad429bc6':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 11:56:13 +00:00
Calin Juravle 29d787b589 am 100386a9: (-s ours) am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
* commit '100386a9e75d28942c6aa1e3ac728571f29110d6':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 11:50:31 +00:00
Calin Juravle 100386a9e7 am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
* commit 'e0677ccf998602e48d3c9777d22c401283464c46':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 11:37:12 +00:00
Calin Juravle e0677ccf99 Merge "NativeBridge: Tighten security on libnativebridge" 2014-08-22 11:31:06 +00:00
Andreas Gampe 049249ce7a NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669

(cherry picked from commit cd2ef4c1af)

Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Andreas Gampe 0f06027a83 am c029f9d2: am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
* commit 'c029f9d225b9a59172d1a0765e4ec6267a868b99':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 05:23:16 +00:00
Andreas Gampe c029f9d225 am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
* commit '4089cda0ae73e71adb787e595c747846e30730ee':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 05:13:50 +00:00
Andreas Gampe 4089cda0ae Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev 2014-08-22 04:56:44 +00:00
Andreas Gampe cd2ef4c1af NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-21 14:33:44 -07:00
Isaac Katzenelson 7ce1fd22bb am 2145a613: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp
* commit '2145a6137e77c683bd5f98c7bb20805bc5cc8cb7':
2014-08-21 04:17:48 +00:00
Colin Cross 0e53fbc8a9 am 422bffb2: am 0b12f0a7: Merge "processgroup: close directories opened by removeAllProcessGroups()" into lmp-dev
* commit '422bffb240e739210260438f5af843da98944b1e':
  processgroup: close directories opened by removeAllProcessGroups()
2014-08-21 04:17:48 +00:00
Elliott Hughes b5b13c12e8 am 176fe900: am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit '176fe9005df41c84c0145f4779222e3b00f3e40f':
  Only the Mac doesn't have open_memstream.
2014-08-21 04:10:34 +00:00
Isaac Katzenelson 2145a6137e Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp 2014-08-21 03:29:59 +00:00
Elliott Hughes 176fe9005d am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
  Only the Mac doesn't have open_memstream.
2014-08-21 03:16:26 +00:00
Colin Cross 422bffb240 am 0b12f0a7: Merge "processgroup: close directories opened by removeAllProcessGroups()" into lmp-dev
* commit '0b12f0a7d6be18705d1972ef9a047159bb001e8f':
  processgroup: close directories opened by removeAllProcessGroups()
2014-08-21 03:06:05 +00:00
Elliott Hughes 4592d73e18 am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit 'a59b6ac6973b3f5ce1246bf73969094779436892':
  Only the Mac doesn't have open_memstream.
2014-08-21 02:58:30 +00:00
Elliott Hughes a59b6ac697 Merge "Only the Mac doesn't have open_memstream." 2014-08-21 00:11:41 +00:00
Elliott Hughes 3ff8888f66 Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it.

Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes 811849979d am 3601abb8: am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit '3601abb810e7e33902e461ed0386673d3be11af9':
  There's no non-SMP LP64.
2014-08-20 21:01:56 +00:00
Elliott Hughes 3601abb810 am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
  There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00
Elliott Hughes f7e88e51b3 am 373c7758: Merge "There\'s no non-SMP LP64."
* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
  There's no non-SMP LP64.
2014-08-20 20:22:23 +00:00
Colin Cross 0b12f0a7d6 Merge "processgroup: close directories opened by removeAllProcessGroups()" into lmp-dev 2014-08-20 20:15:45 +00:00
Colin Cross c15dd04470 processgroup: close directories opened by removeAllProcessGroups()
removeAllProcessGroups and removeUidProcessGroups were calling
opendir, but never called closedir.  This would leave a leaked
file descriptor for every /acct/uid_* directory that existed
at boot.

Change-Id: Ia08eccd42d6ad7a6c1c78402519ac2e53b4fc83a
2014-08-20 14:11:13 -07:00
Elliott Hughes 373c77583f Merge "There's no non-SMP LP64." 2014-08-20 12:21:52 +00:00
Elliott Hughes 901c900ce6 There's no non-SMP LP64.
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Igor Murashkin 613831b958 am 831789a9: am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack when getting thread name fails" into lmp-dev
* commit '831789a9f257bd929caa2fb927c4b902459cce53':
  libutils: Don't segfault ProcessCallStack when getting thread name fails
2014-08-19 23:57:54 +00:00
Igor Murashkin 831789a9f2 am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack when getting thread name fails" into lmp-dev
* commit '6ba555f2ad878129cd1da9dd7b7613ab166090ab':
  libutils: Don't segfault ProcessCallStack when getting thread name fails
2014-08-19 23:44:28 +00:00
Igor Murashkin 6ba555f2ad Merge "libutils: Don't segfault ProcessCallStack when getting thread name fails" into lmp-dev 2014-08-19 22:53:25 +00:00
Dan Albert 6ff2fd9376 am a4c647b6: am 3e3fbc4d: Merge "Update for public android_set_abort_message()." into lmp-dev
* commit 'a4c647b6988cbcc4120672b1a98e76a53aebc3fc':
  Update for public android_set_abort_message().
2014-08-19 20:30:45 +00:00