Commit graph

4303 commits

Author SHA1 Message Date
Dima Zavin
9481266ea3 init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
Bug: 7232205
Change-Id: I0d785302818a37b722e79bf740644ede52c60148
Signed-off-by: Dima Zavin <dima@android.com>
2012-09-25 14:22:04 -07:00
Ben Cheng
0b76d02099 Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev 2012-09-24 14:30:06 -07:00
Todd Poynor
f1c50bf638 init: import init.trace.rc after h/w-specific rc
Board-specific .rc file mounts debugfs, then fixup perms on tracing
sysfs files for systrace.

Change-Id: Ifbedb4ecdb543cd6c48df00b1a34415349951b6f
2012-09-24 14:26:31 -07:00
Ben Cheng
c47b772b67 Dump 256 bytes per chunk pointed by general-purpose registers.
Bug: 7216522
Change-Id: Iddcec8399b00ad411be6863dd866a3f74377ba03
2012-09-24 14:13:37 -07:00
Elliott Hughes
c611911e11 am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '0933c6f4d8536eb1c950bb8900ba925dc6b0b00e':
  The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 10:16:40 -07:00
Elliott Hughes
0933c6f4d8 am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit 'e2a3fe235e6577b5956e86af3fc8b31845ef54ac':
  The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 08:59:35 -07:00
Elliott Hughes
e2a3fe235e am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '2dbef6ae08eec8815863b89046653a1a73443a7c':
  The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 08:57:47 -07:00
Elliott Hughes
2dbef6ae08 Merge "The localtime_tz and mktime_tz extensions are now in bionic." 2012-09-24 08:41:43 -07:00
Colin Cross
b98865586b libsuspend: force autosleep off during init
If autosuspend_autosleep_init is called when autosleep is enabled,
for example after a runtime restart with the screen off, the kernel
autosleep state will be enabled, but autosuspend_enabled is false.
Further calls to autosuspend_disable by the framework will not result
in autosleep being disabled.

Call autosuspend_autosleep_disable from autosuspend_autosleep_init
to get the kernel state into a known state that matches the
autosuspend_enabled flag.

Bug: 7119416
Change-Id: I8611e4fd256838272aad4382c2340508805b0376
2012-09-21 18:39:17 -07:00
Jamie Gennis
96094ae27c ANW: fix my fix for a file descriptor leak
Change-Id: Ief7b973fbdb76920abed19707963a0c3d306af31
2012-09-20 17:25:23 -07:00
Doug Zongker
45b0385ac4 Merge "remove unneeded import" into jb-mr1-dev 2012-09-20 16:46:38 -07:00
Zhihai Xu
e16534f8f7 Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:43:26 -07:00
Doug Zongker
ede5cf6533 remove unneeded import
DumpPublicKey doesn't need a base64 encoder for anything; remove the
import to avoid deprecation warnings.

Change-Id: I7e01b9d77bb66bb99cb3357c886cc4e2e63de6ae
2012-09-20 15:55:20 -07:00
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
0d699de0fc Merge "Add explicit sync call to ion library" into jb-mr1-dev 2012-09-20 13:59:11 -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
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
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
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
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
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
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
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
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
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
7e014ce6de am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'cdc4a400b3a47564887ac1220bfb7f6f8312a71e':
  Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:08:42 -07:00
Elliott Hughes
cdc4a400b3 am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit 'cb71ed3092cef3b1c56d8d873788daea82de7879':
  Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:06:49 -07:00
Elliott Hughes
cb71ed3092 am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
* commit '50e2555d6c824bd3c7e664f222061158a83ac705':
  Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:04:47 -07:00
Elliott Hughes
50e2555d6c Merge "Always include <sys/socket.h> before <linux/netlink.h>." 2012-09-12 10:25:15 -07:00
Elliott Hughes
b77d3d7249 Always include <sys/socket.h> before <linux/netlink.h>.
Newer kernel headers files aren't stand alone. (This has long been true of
glibc's copy, but we only recently updated external/kernel-headers.)

Change-Id: Iebcb40902b2f29fe509e207e2f3a9d02a7e40602
2012-09-12 10:10:20 -07:00
Elliott Hughes
d03072ffde The localtime_tz and mktime_tz extensions are now in bionic.
Bug: 7012465
Change-Id: I5f3d06fe06fad7c3ff6d1950770a30f4f83e56ff
2012-09-11 11:18:38 -07:00
Kenny Root
0f5e303c6a Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev 2012-09-10 17:05:23 -07:00
Colin Cross
fb4a4c3585 am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
* commit 'e6b898106c7c6f42529db185481d1d4805e91aff':
  fastboot: move help command before usb connect
2012-09-10 14:47:38 -07:00
Colin Cross
e6b898106c am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
* commit 'eb7ee9c0c513160d8db5c76a82f56ed966ec41c0':
  fastboot: move help command before usb connect
2012-09-10 14:45:43 -07:00
Colin Cross
eb7ee9c0c5 am 922b460c: Merge "fastboot: move help command before usb connect"
* commit '922b460cc790722ffc303b200f02958e4066a2de':
  fastboot: move help command before usb connect
2012-09-10 14:43:26 -07:00
Colin Cross
922b460cc7 Merge "fastboot: move help command before usb connect" 2012-09-10 14:13:29 -07:00
Colin Cross
80f9867431 fastboot: move help command before usb connect
Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.

Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
2012-09-10 14:12:37 -07:00
Colin Cross
ae807aaa02 Merge "fastboot: move help command before usb connect" into jb-mr1-dev 2012-09-10 14:11:44 -07:00
Kenny Root
5054417c10 Add /data/app-lib for native library sharing
Change-Id: I7419676d987178fd2422c50d74f966e27af9f62e
2012-09-08 22:39:44 -07:00
Ian Rogers
64604840de am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
* commit '6de267876b9311d635b7fe4eec81a4a859ac1790':
  Remove unnecessary compiler pragma.
2012-09-07 20:35:02 -07:00