Commit graph

5185 commits

Author SHA1 Message Date
Nick Kralevich
db3eb6844c am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit 'e657e0c2a4a30104c650e7ad8827e8e887af0cb9':
  liblog: fix fd leakage
2013-03-15 10:08:30 -07:00
Nick Kralevich
e657e0c2a4 am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e':
  liblog: fix fd leakage
2013-03-15 10:06:45 -07:00
Nick Kralevich
1a2bdd6fbe Merge "liblog: fix fd leakage" 2013-03-15 16:56:40 +00:00
Nick Kralevich
a170322083 liblog: fix fd leakage
File descriptors remain open across an exec unless FD_CLOEXEC is
set.  Add O_CLOEXEC to the open() call to prevent file descriptor
leakage.

In particular, the following program will eventually run out of
file descriptors:

int main(int argc, char **argv) {
  printf("===== entering main =====\n");
  ALOGW("entering main");
  system("ls -l /proc/self/fd/");

  execv(argv[0], argv);
  printf("exec failed\n");
  return -1;
}

Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
2013-03-15 09:48:32 -07:00
Rom Lemarchand
74a7b91cbe liblogwrap: lock android_fork_execvp
Add a lock around android_fork_execvp to ensure no two threads can
execute it at the same time.

This is to help with http://b/8333626

Change-Id: I75d087a74b58f5b8e878675b301200f54d976fb2
2013-03-14 21:31:07 -07:00
Colin Cross
39b7fdea31 am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"
* commit 'c8c95f86712989003ddd9c55261942d0d83ca9f4':
  ueventd: allow platform devices to have just a /devices/ prefix
2013-03-14 18:30:59 -07:00
Colin Cross
c8c95f8671 am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"
* commit '80dac35023bb7860b7382ca995e19710bd894e7e':
  ueventd: allow platform devices to have just a /devices/ prefix
2013-03-14 18:29:19 -07:00
Colin Cross
80dac35023 Merge "ueventd: allow platform devices to have just a /devices/ prefix" 2013-03-15 01:16:17 +00:00
Dima Zavin
f395c9237d ueventd: allow platform devices to have just a /devices/ prefix
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-14 18:14:32 -07:00
Elliott Hughes
e05093b924 am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"
* commit '3e77b7521ba96fd1ff6fed0e019aff5f46a31428':
  Unwinding implementation via eh_frame sections for x86
2013-03-14 17:25:04 -07:00
Elliott Hughes
3e77b7521b am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"
* commit '0b5355589429cabac0e16f36c6e6541f8aafba08':
  Unwinding implementation via eh_frame sections for x86
2013-03-14 17:23:35 -07:00
Elliott Hughes
0b53555894 Merge "Unwinding implementation via eh_frame sections for x86" 2013-03-14 23:32:54 +00:00
Nick Kralevich
eb6dd010b5 am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit '9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
2013-03-14 16:16:40 -07:00
Nick Kralevich
9573a1755c am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
2013-03-14 16:14:06 -07:00
Nick Kralevich
dbf4937b5a Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 2013-03-14 22:28:24 +00:00
Nick Kralevich
76ba83cce2 Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
This logic has been moved to platform/frameworks/base commit
8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed
here.

This reverts commit 01b1dee0ab.
2013-03-14 15:23:30 -07:00
Jeff Sharkey
fb4f7acefb Add symlink to bugreport storage location.
Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
2013-03-14 14:27:38 -07:00
Pavel Chupin
af2cb3667b Unwinding implementation via eh_frame sections for x86
Backtracing through eh_frame section is more effective allowing to reuse
ebp register for other purposes within routine. GCC with turned on
optimizations (-O1 and above) implicitly defines -fomit-frame-pointer
anyway. eh_frame sections are generated by default with GCC on any
optimization level.

This change implements remote unwinding (separate process unwinding).
Local unwinding is already implemented through _Unwind_Backtrace call
which is implemented in libgcc.

Change-Id: I1aea1ecd19c21710f9cf5f05dc272fc51b67b7aa
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-03-14 19:11:44 +04:00
Sam Lin
91535cff09 Merge "Add vendor IDs to adb" into jb-mr2-dev 2013-03-13 03:01:45 +00:00
Colin Cross
d4b360a2e8 am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
  mkbootimg: support 8192/16384 pagesizes
2013-03-12 16:53:24 -07:00
Colin Cross
1d77e6e4e3 am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit '3960ec226d07c7327ac6967a2977c521fd4884b6':
  mkbootimg: support 8192/16384 pagesizes
2013-03-12 16:50:40 -07:00
Colin Cross
3960ec226d Merge "mkbootimg: support 8192/16384 pagesizes" 2013-03-12 21:47:47 +00:00
Rom Lemarchand
451dd85fb2 liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
Makes the code slightly more readable and avoids boilerplate.

Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
2013-03-12 08:55:38 -07:00
Sam Lin
644b6afdac Add vendor IDs to adb
Adding vendor IDs to adb for device partners:
  AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
2013-03-12 20:19:53 +08:00
Jean-Baptiste Queru
7398664de3 am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':
2013-03-11 13:44:39 -07:00
Jean-Baptiste Queru
c8b3fee48c am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f9094401491ecee8e574b294a22e850bfc2b5043':
2013-03-11 13:13:49 -07:00
Jean-Baptiste Queru
f909440149 am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '75f29709af6d053168402dd12cdf8b0a58b0c35e':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 13:00:54 -07:00
Jean-Baptiste Queru
75f29709af am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '09b43645514669b3ff8181b0a111bc14576e3699':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 12:47:27 -07:00
Jean-Baptiste Queru
09b4364551 am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 12:28:11 -07:00
Jean-Baptiste Queru
92b2cd23f7 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:23:26 -07:00
Dima Zavin
53a0288463 ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-11 11:13:17 -07:00
Ithamar R. Adema
81ce3a79ff mkbootimg: support 8192/16384 pagesizes
By now these sizes are very common, so make sure we support them.

Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
2013-03-10 14:11:10 +01:00
Elliott Hughes
dd0d0e78af am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"
* commit '822ea9b3d1cf240b16135e1b5c3bd926c02d17d6':
  Close adb_usb.ini after reading it
2013-03-08 18:32:02 -08:00
Elliott Hughes
822ea9b3d1 am fd5c6b9f: Merge "Close adb_usb.ini after reading it"
* commit 'fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd':
  Close adb_usb.ini after reading it
2013-03-08 18:30:44 -08:00
Elliott Hughes
fd5c6b9f13 Merge "Close adb_usb.ini after reading it" 2013-03-09 01:20:08 +00:00
Christopher Tate
0c06eb5017 DO NOT MERGE - Document new -obb flag for adb backup
Now that adb backup handles OBB file backup/restore.

(Cherrypicked)

Change-Id: Ie92b546e3898b62d74f552ab577b7756ad176ee6
2013-03-08 15:09:51 -08:00
JP Abgrall
7b8970c577 fastboot: add support for some obscure args.
Some devices use mkbootimg with weird args for which fastboot
only a hardcoded value.

Now fastboot recognizes those args.

Made handling of global vars more consistent.

Bug: 8341331
Change-Id: Ic09f148ccd0249f49935fdc63e517cf8ab2229bc
2013-03-07 17:06:41 -08:00
Colin Cross
2fa2dfd105 Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev 2013-03-07 22:38:34 +00:00
Doug Zongker
598169e768 Merge "charger: accomodate minui change" into jb-mr2-dev 2013-03-07 22:33:51 +00:00
Colin Cross
a5064626de init: prevent action being added to the action_queue twice
Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue.  Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
2013-03-07 13:44:59 -08:00
Doug Zongker
12c45fb9be charger: accomodate minui change
gr_text() now takes an argument requesting bold text instead of
regular.

Change-Id: I18b54f05ae4a89cb753fa5977a870f1bc827b963
2013-03-07 13:35:23 -08:00
Keun young Park
4c8c35d06c Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev 2013-03-06 00:36:31 +00:00
Alex Ray
81b5b5fb02 sync: factor sw_sync functionality out of header
Change-Id: I13127abe1cd07cd52b35ff43902579478505ccf4
2013-03-05 15:53:24 -08:00
Keun young Park
f5eb803543 move goldfish stuffs to device/generic/goldfish
- each files will be pulled in emulator.mk as PRODUCT_COPY_FILES

Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
2013-03-05 11:16:36 -08:00
Colin Cross
95b087fa90 am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"
* commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6':
  Fix issues where the filename is referred to as 'sideload'
2013-03-05 18:52:29 +00:00
Colin Cross
7c646cd359 am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context."
* commit 'af4ececc7bd10aec1240acfbfe7756ab8ee16883':
  run-as:  set the SELinux security context.
2013-03-05 18:52:28 +00:00
Colin Cross
79d4381a8e am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"
* commit '69f3ec84cf4e9a1bf4c222b88b4413da407331b5':
  Fix issues where the filename is referred to as 'sideload'
2013-03-05 10:27:41 -08:00
Colin Cross
af4ececc7b am 515bed0e: Merge "run-as: set the SELinux security context."
* commit '515bed0e6aae4a835ab4393499c7dd99941a8423':
  run-as:  set the SELinux security context.
2013-03-05 10:27:40 -08:00
Colin Cross
69f3ec84cf Merge "Fix issues where the filename is referred to as 'sideload'" 2013-03-05 17:33:54 +00:00
Colin Cross
515bed0e6a Merge "run-as: set the SELinux security context." 2013-03-05 17:31:38 +00:00