Commit Graph

4719 Commits

Author SHA1 Message Date
Mathias Agopian 37bd30bfd5 Merge "ANW: fix an fd leak" into jb-mr1-dev 2012-09-20 14:09:08 -07:00
Ying Wang 813601785f Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev 2012-09-20 14:07:52 -07:00
Rebecca Schultz Zavin 951636260a am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev
* commit '0d699de0fca487328e6dfc86847f33a0214ca253':
  Add explicit sync call to ion library
2012-09-20 14:01:44 -07:00
Rebecca Schultz Zavin 0d699de0fc Merge "Add explicit sync call to ion library" into jb-mr1-dev 2012-09-20 13:59:11 -07:00
Ben Cheng 258949553a am 34205c63: am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev
* commit '34205c634930288c3852438b0bd40604003cf232':
  Print the revision number in the tombstone file.
2012-09-20 13:25:25 -07:00
Ben Cheng 34205c6349 am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev
* commit 'fbafa63b339808bf8082b705c5121e529e8be29f':
  Print the revision number in the tombstone file.
2012-09-20 13:20:56 -07:00
Ben Cheng fbafa63b33 Merge "Print the revision number in the tombstone file." into jb-mr1-dev 2012-09-20 13:18:06 -07:00
The Android Open Source Project 6dd8683396 am 171336be: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '171336be126743cf9042971fd076b955ad596ffa':
  Wrap system calls in TEMP_FAILURE_RETRY.
2012-09-20 12:46:02 -07:00
Jamie Gennis 9bd8dd3b13 ANW: fix an fd leak
Change-Id: Id44cae6732c6694d2f470cbdfa5f59e7474f704f
2012-09-20 11:43:43 -07:00
Zhihai Xu c2f59d87d8 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
remove system/bluetooth stuff.

bug 6849488
Change-Id: I81a94d34a4363562a74fa2e574828fd919cfe18c
2012-09-20 10:55:06 -07:00
The Android Open Source Project 171336be12 Reconcile with jb-mr1-release - do not merge
Change-Id: If24ab92e844fb1a6e6cdec7bb9cdfba887df812a
2012-09-20 10:37:27 -07:00
Ying Wang 07a56fb0d3 Move AndroidConfig.hs to the build project.
Change-Id: I482e36f9e7f665d7cfe43463c9cbc15846e8b20a
2012-09-20 10:05:51 -07:00
Rebecca Schultz Zavin 3cfcc30005 Add explicit sync call to ion library
Bug: 6854979
Change-Id: I535d55af897eeb4ed707b5da54f3fbf36afa452c
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:46:19 -07:00
The Android Automerger c24eac1561 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 07:00:45 -07:00
Nick Kralevich 400b89b218 am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev
* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
  init: Don't read local properties if ro.debuggable=0
2012-09-20 06:20:21 -07:00
Ben Cheng d7760c1688 Print the revision number in the tombstone file.
Bug: 7168261
Change-Id: Icb412760d018e4bbb1a5d742ed7d484d5cf6b470
2012-09-19 19:19:53 -07:00
Nick Kralevich 32f594a5b4 am a8b91609: am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev
* commit 'a8b916093772627f55fa1bfb624fdebf38af171b':
  init: Don't read local properties if ro.debuggable=0
2012-09-19 15:21:19 -07:00
Nick Kralevich a8b9160937 am e1df9ad2: Merge "init: Don\'t read local properties if ro.debuggable=0" into jb-mr1-dev
* commit 'e1df9ad215af6e51a2d8fb1d0306e00c7b510b62':
  init: Don't read local properties if ro.debuggable=0
2012-09-19 14:08:46 -07:00
Nick Kralevich e1df9ad215 Merge "init: Don't read local properties if ro.debuggable=0" into jb-mr1-dev 2012-09-19 13:05:06 -07:00
Nick Kralevich 32b9023d08 init: Don't read local properties if ro.debuggable=0
Bug: 7195965
Change-Id: I29fdad61aa61f2c46d49db227cf7b84d9cc6f25d
2012-09-19 13:03:18 -07:00
The Android Automerger e580fc63c4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:53 -07:00
Geremy Condra 581c484d2e am 1683413f: (-s ours) Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
  DO NOT MERGE Add event log tag for cert pin failures.
2012-09-18 15:54:31 -07:00
Geremy Condra 3ce056d7cb am 1e3cab0b: (-s ours) am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
* commit '1e3cab0b88a15670345fc9e89d649de9e028e640':
  DO NOT MERGE Add event log tag for cert pin failures.
2012-09-18 15:38:17 -07:00
Geremy Condra 1e3cab0b88 am 1683413f: Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
* commit '1683413f413eb1b77f527247db2df31eae93ee3a':
  DO NOT MERGE Add event log tag for cert pin failures.
2012-09-18 15:30:45 -07:00
Geremy Condra 1683413f41 Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev 2012-09-18 15:28:38 -07:00
Jeff Sharkey e7b153b845 am 0a4a4bbb: am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit '0a4a4bbb21919a2730cb6f6ba207c10cef52535a':
  Wrap more system calls in TEMP_FAILURE_RETRY.
2012-09-14 10:27:55 -07:00
Jeff Sharkey 77b1cba18c am 67c01dfe: am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit '67c01dfe6db2bbe386eb98114c2a89f7dbf7bd2d':
  Wrap system calls in TEMP_FAILURE_RETRY.
2012-09-14 10:27:50 -07:00
The Android Automerger 7241a04d16 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 07:12:43 -07:00
Jeff Sharkey 4a31de8496 Wrap system calls in TEMP_FAILURE_RETRY.
fs_prepare_dir() is used heavily during Zygote init, and can easily
run into EINTR.

Bug: 7151474
Change-Id: I7aac43a43483d55db47ca20456fff68ce51bbc46
2012-09-13 15:44:17 -07:00
Jeff Sharkey 5e310605a5 am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit 'a6cf7746cb8732897c3bbafffd52667c7e02d579':
  Wrap more system calls in TEMP_FAILURE_RETRY.
2012-09-13 15:15:07 -07:00
Jeff Sharkey 0a4a4bbb21 am a6cf7746: Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit 'a6cf7746cb8732897c3bbafffd52667c7e02d579':
  Wrap more system calls in TEMP_FAILURE_RETRY.
2012-09-13 15:14:57 -07:00
Jeff Sharkey a6cf7746cb Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev 2012-09-13 15:13:16 -07:00
Jeff Sharkey 6de7026790 Wrap more system calls in TEMP_FAILURE_RETRY.
Bug: 7151474
Change-Id: I9fe19746104cf392f88ea5cf8061e2e21e334671
2012-09-13 15:11:42 -07:00
Jeff Sharkey 01718515c9 am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit '7918d816401a92456709ba64ccbe60b8e5ffb14c':
  Wrap system calls in TEMP_FAILURE_RETRY.
2012-09-13 15:09:53 -07:00
Jeff Sharkey 67c01dfe6d am 7918d816: Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
* commit '7918d816401a92456709ba64ccbe60b8e5ffb14c':
  Wrap system calls in TEMP_FAILURE_RETRY.
2012-09-13 15:09:42 -07:00
Jeff Sharkey 7918d81640 Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev 2012-09-13 15:07:42 -07:00
Jeff Sharkey ddb1733944 Wrap system calls in TEMP_FAILURE_RETRY.
fs_prepare_dir() is used heavily during Zygote init, and can easily
run into EINTR.

Bug: 7151474
Change-Id: I7aac43a43483d55db47ca20456fff68ce51bbc46
2012-09-13 15:02:53 -07:00
Kenny Root f0a0c3ce5e am d2b2f89f: am ad59e0a9: am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
* commit 'd2b2f89f17b8dca3b8686dfea7a07799ed4d165c':
  Add shared app gid to fs config
2012-09-13 14:13:05 -07:00
Kenny Root f3023dcd79 am ad59e0a9: am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
* commit 'ad59e0a90ec414ddc59cbe73319039981f433c53':
  Add shared app gid to fs config
2012-09-13 13:08:10 -07:00
Kenny Root d2b2f89f17 am ad59e0a9: am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
* commit 'ad59e0a90ec414ddc59cbe73319039981f433c53':
  Add shared app gid to fs config
2012-09-13 13:08:03 -07:00
Kenny Root ad59e0a90e am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
* commit 'c92961dccb38c6e6a9dbcf519bd59461bbc0dc7c':
  Add shared app gid to fs config
2012-09-13 13:06:58 -07:00
Kenny Root c92961dccb am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
* commit 'b905f121c324cfec51f5b8cd424f36fc0f22676d':
  Add shared app gid to fs config
2012-09-13 13:05:01 -07:00
Kenny Root b905f121c3 am 9796a83a: Merge "Add shared app gid to fs config"
* commit '9796a83a39e757558c07e17bd277ab2694762dfd':
  Add shared app gid to fs config
2012-09-13 13:02:42 -07:00
Kenny Root 9796a83a39 Merge "Add shared app gid to fs config" 2012-09-13 12:10:54 -07:00
Kenny Root 7e41c8420e Add shared app gid to fs config
This will allow native tools to be able to know where the shared app
gids start and end.

Change-Id: Ie4529baf36b361c51c42f079b259c352e316647f
2012-09-13 11:23:55 -07:00
The Android Automerger 007ce1d1c0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-13 07:00:48 -07:00
Geremy Condra 4a23e1df12 DO NOT MERGE Add event log tag for cert pin failures.
Change-Id: Ib93f4eeec35b5754498464ada94faeb2bdb0b896
2012-09-12 18:08:35 -07:00
Elliott Hughes 4deee74ef0 am f135a447: am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'f135a4470ded733f2a10b893449242d2e2110565':
  Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 17:02:37 -07:00
The Android Open Source Project 2aebf3d47d am b6f137c7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b6f137c7d8539dd0cf837a25acb097b33d306c87':
2012-09-12 16:59:09 -07:00
Elliott Hughes f135a4470d am 7e014ce6: am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit '7e014ce6defdfe596d83ff549a13f7215151069e':
  Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:10:55 -07:00