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
Elliott Hughes
c17f18612b
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:11 -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
Irina Tirdea
295b82bd69
Rename getline to fs_getline for fs_mgr
...
fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.
Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.
This is needed it we want to add getline in bionic.
Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-12 19:48:51 +03:00
The Android Open Source Project
b6f137c7d8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3935a689501afea5ad92ff559aa433b03d78bd65
2012-09-12 07:41:57 -07:00
Geremy Condra
d832567908
Add event log tag for cert pin failures.
...
Change-Id: Ib93f4eeec35b5754498464ada94faeb2bdb0b896
2012-09-11 21:38:31 -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
The Android Automerger
a95c0fa986
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 07:00:15 -07:00
Kenny Root
2a048fe827
am 12dc7c8e: am 0f5e303c: Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
...
* commit '12dc7c8e4ba43d6dbca28ccb78de40a816ca162f':
Add /data/app-lib for native library sharing
2012-09-10 17:25:01 -07:00
Colin Cross
c2cb108647
am 8ada7b0e: am fb4a4c35: am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit '8ada7b0e6a023e036de20158b293e2c301602433':
fastboot: move help command before usb connect
2012-09-10 17:16:11 -07:00
Colin Cross
910bbfa9b7
am 85605900: am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev
...
* commit '856059003bde3b235ea907c66cc1742e665ae4a2':
fastboot: move help command before usb connect
2012-09-10 17:15:53 -07:00