ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13543 commits 1 branch 0 tags 217 MiB
Commit graph

13543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Sharkey
6a0f89eca3 Merge "Give SocketListener some FD_CLOEXEC." 2015-04-02 17:08:28 +00:00
Paul Lawrence
b8bd76b7cb Merge "Revert "Revert "Adding e4crypt support""" 2015-04-02 14:49:25 +00:00
Brian Carlstrom
4761c2a0e5 am a6fa57d2: am 8c755dfe: am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy" 
* commit 'a6fa57d23f8a322aab22efd03689826e4a107f64':
  Fix shared version of libcutils on the host to include strlcpy
 2015-04-02 14:17:54 +00:00
Brian Carlstrom
a6fa57d23f am 8c755dfe: am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy" 
* commit '8c755dfe4c1a479fe5f64d1ea0c32be89268da87':
  Fix shared version of libcutils on the host to include strlcpy
 2015-04-02 13:55:16 +00:00
Brian Carlstrom
8c755dfe4c am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy" 
* commit 'c7cddffa14369265c82e5a08797f7ba687d174ef':
  Fix shared version of libcutils on the host to include strlcpy
 2015-04-02 13:44:40 +00:00
Brian Carlstrom
c7cddffa14 Merge "Fix shared version of libcutils on the host to include strlcpy" 2015-04-02 07:51:10 +00:00
Brian Carlstrom
60a347fc87 Fix shared version of libcutils on the host to include strlcpy 
Change-Id: Ic727508d9cfadea0050d1ccc491ee61aac1ef55a
 2015-04-02 00:43:45 -07:00
Jeff Sharkey
55fd316ea7 Give SocketListener some FD_CLOEXEC. 
Sockets love FD_CLOEXEC.

Bug: 19993667
Change-Id: I0d72a27e0f46b79843bb91ed48ebaf1c89484fd2
 2015-04-01 22:31:40 -07:00
Jeff Sharkey
70837dd4ac Merge "Different blkid and fsck execution domains." 2015-04-02 05:00:03 +00:00
Etan Cohen
542a49083f Merge "Merge commit 'a8cb3cd1601909ae04e14cd5ce42c286a8cf3ba4' into merge" 2015-04-02 03:08:17 +00:00
Elliott Hughes
bfe72ddb20 am d71b0943: am 2d4a347e: am fad9b3eb: Merge "sdcard: Turn on noatime for fuse mounted sdcard" 
* commit 'd71b0943de271d308ec1aeb1fa834dd35fedee50':
  sdcard: Turn on noatime for fuse mounted sdcard
 2015-04-02 02:59:56 +00:00
Christopher Ferris
86deedaba7 am 001ca709: am 2be40f76: am 88628e2b: Merge "Discards frames for code within library." 
* commit '001ca70933d803264b97283f59aa0baf4abe35b2':
  Discards frames for code within library.
 2015-04-02 02:59:53 +00:00
Dan Albert
fc38d5c617 am 3ffe909c: am a7be3440: am 7ab2c78e: Merge "Revert "Disable the static libcutils tests."" 
* commit '3ffe909c96735eb52b47e9804c38bc4805f0aa89':
  Revert "Disable the static libcutils tests."
 2015-04-02 02:48:50 +00:00
Elliott Hughes
d71b0943de am 2d4a347e: am fad9b3eb: Merge "sdcard: Turn on noatime for fuse mounted sdcard" 
* commit '2d4a347eb58e1992ff39ed624ddab45b427b742c':
  sdcard: Turn on noatime for fuse mounted sdcard
 2015-04-02 02:24:22 +00:00
Christopher Ferris
001ca70933 am 2be40f76: am 88628e2b: Merge "Discards frames for code within library." 
* commit '2be40f767b254b25d2cb32616b3340bdd83ccf41':
  Discards frames for code within library.
 2015-04-02 02:24:21 +00:00
Elliott Hughes
2d4a347eb5 am fad9b3eb: Merge "sdcard: Turn on noatime for fuse mounted sdcard" 
* commit 'fad9b3ebb8f5966e2afd7ff65d78ecc3330aaa3e':
  sdcard: Turn on noatime for fuse mounted sdcard
 2015-04-02 02:13:22 +00:00
Christopher Ferris
2be40f767b am 88628e2b: Merge "Discards frames for code within library." 
* commit '88628e2baf83a604f9b443d0c1b67cd11f4ceef3':
  Discards frames for code within library.
 2015-04-02 02:13:21 +00:00
Elliott Hughes
fad9b3ebb8 Merge "sdcard: Turn on noatime for fuse mounted sdcard" 2015-04-02 02:05:42 +00:00
Dan Albert
487abaaf86 am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr." 
* commit '1c4cdf72a685fe2b913244991b79a81a0d1c2620':
  Link libc++_static into fs_mgr.
 2015-04-02 01:38:18 +00:00
Christopher Ferris
88628e2baf Merge "Discards frames for code within library." 2015-04-02 01:24:22 +00:00
Dan Albert
3ffe909c96 am a7be3440: am 7ab2c78e: Merge "Revert "Disable the static libcutils tests."" 
* commit 'a7be34404c3089a7992fc61f8dea14204d6d2e82':
  Revert "Disable the static libcutils tests."
 2015-04-02 01:09:22 +00:00
Dan Albert
a7be34404c am 7ab2c78e: Merge "Revert "Disable the static libcutils tests."" 
* commit '7ab2c78ee9a7df21d149b6c5228f9d0fccb066e0':
  Revert "Disable the static libcutils tests."
 2015-04-02 00:59:19 +00:00
Dan Albert
7ab2c78ee9 Merge "Revert "Disable the static libcutils tests."" 2015-04-01 23:48:06 +00:00
Dan Albert
43db1c347b Revert "Disable the static libcutils tests." 
Also move them to libc++ since stlport is dead.

Bug: 18389856

This reverts commit bb28776db0.

Change-Id: Icdf9be3bc5cc40433727ff71a121b145002dda72
 2015-04-01 16:45:28 -07:00
Christopher Ferris
ca09ce902c Discards frames for code within library. 
When doing a local unwind, do not include the frames that come
from either libunwind or libbacktrace.

Bug: 11518609
Change-Id: I0ec8d823aebbfa0903e61b16b7e5663f3fd65e78
 2015-04-01 15:58:20 -07:00
Mark Salyzyn
a49938e125 am 93f7fbab: am 4bf04380: am 22155474: Merge "logd: missing include for string.h" 
* commit '93f7fbab77d81b28f4a66599c9f6f813e10c83da':
  logd: missing include for string.h
 2015-04-01 22:09:34 +00:00
Mark Salyzyn
a699c75fee am 382ab18c: am 5bcbcb50: am 4f6e51a0: Merge "package missing include for string.h" 
* commit '382ab18c3081108365f38a9af3925d57cdd7f2e7':
  package missing include for string.h
 2015-04-01 22:09:33 +00:00
Dan Albert
1c4cdf72a6 am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr." 
* commit '4f6c526e13eb00c94f8745fb9e52f10c3474a87f':
  Link libc++_static into fs_mgr.
 2015-04-01 20:48:24 +00:00
Paul Lawrence
c410b3bd63 Revert "Revert "Adding e4crypt support"" 
Fix build break caused by original change

This reverts commit 84b0bab58f.

(cherry picked from commit bbb4c85bdcc9a1bce315ed9d61a228bb1b992a1c)

Change-Id: If0ead0f2656b69f33f72c64b03a05784455a4143
 2015-04-01 13:48:06 -07:00
Dan Albert
4f6c526e13 am 3891cfef: Merge "Link libc++_static into fs_mgr." 
* commit '3891cfef5e27da0f33ccab42e9a14cc1e38331ee':
  Link libc++_static into fs_mgr.
 2015-04-01 20:37:48 +00:00
Dan Albert
3891cfef5e Merge "Link libc++_static into fs_mgr." 2015-04-01 20:27:57 +00:00
Dan Albert
bbbc634e09 Link libc++_static into fs_mgr. 
Change-Id: Ic2461d3a30dbd8a22f9800a33fac27c658340b21
 2015-04-01 13:26:04 -07:00
Mark Salyzyn
93f7fbab77 am 4bf04380: am 22155474: Merge "logd: missing include for string.h" 
* commit '4bf0438083bfd789ee7e59bf6c358c4a83b62f07':
  logd: missing include for string.h
 2015-04-01 19:48:55 +00:00
Mark Salyzyn
382ab18c30 am 5bcbcb50: am 4f6e51a0: Merge "package missing include for string.h" 
* commit '5bcbcb50bab88a01e49bddc6aab62039490298b1':
  package missing include for string.h
 2015-04-01 19:48:54 +00:00
Mark Salyzyn
4bf0438083 am 22155474: Merge "logd: missing include for string.h" 
* commit '221554749337a9c961c192596be5eb4e42083733':
  logd: missing include for string.h
 2015-04-01 19:38:05 +00:00
Mark Salyzyn
5bcbcb50ba am 4f6e51a0: Merge "package missing include for string.h" 
* commit '4f6e51a032892b1a053efa2b41ebb29e4f1bb5be':
  package missing include for string.h
 2015-04-01 19:38:03 +00:00
Elliott Hughes
5ece5c1368 am d92e74bc: am 0dd1dd2f: am a57fb596: Merge "Remove no-op "capabilities"." 
* commit 'd92e74bc5ef57234dfa9d726f3f0d05a9e3c146e':
  Remove no-op "capabilities".
 2015-04-01 19:28:16 +00:00
Mark Salyzyn
2215547493 Merge "logd: missing include for string.h" 2015-04-01 19:27:09 +00:00
Mark Salyzyn
4f6e51a032 Merge "package missing include for string.h" 2015-04-01 19:26:50 +00:00
Paul Lawrence
1179b674cb am 2c383211: (-s ours) am ffe5c0d1: am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" 
* commit '2c383211528305f1db870a226f8734cdfc6bae4c':
  Revert "Revert "Adding e4crypt support""
 2015-04-01 19:05:38 +00:00
Elliott Hughes
d92e74bc5e am 0dd1dd2f: am a57fb596: Merge "Remove no-op "capabilities"." 
* commit '0dd1dd2f318c1ae7a9f1844625e7ff85a1119a88':
  Remove no-op "capabilities".
 2015-04-01 18:58:39 +00:00
Jeff Sharkey
25775e8e63 Different blkid and fsck execution domains. 
Tell vold about which SELinux domains to use for different classes
of devices.  Also create a directory for vold to store private
files.

Bug: 19993667
Change-Id: Ib7bc80234f2b13a89b143bf90f147140109570cd
 2015-04-01 11:55:50 -07:00
Elliott Hughes
0dd1dd2f31 am a57fb596: Merge "Remove no-op "capabilities"." 
* commit 'a57fb596f31ae415446841b35dd8aefe8273b409':
  Remove no-op "capabilities".
 2015-04-01 18:48:16 +00:00
Elliott Hughes
a57fb596f3 Merge "Remove no-op "capabilities"." 2015-04-01 18:37:06 +00:00
Mark Salyzyn
801bcecbb5 logd: missing include for string.h 
LogCommand.cpp gets string.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for string.h in this
include file.

Bug: 19908228
Change-Id: Iaf3a77298b56efd8004300b17e9a1faafad5b08b
 2015-04-01 11:18:42 -07:00
Mark Salyzyn
68ffc74e32 package missing include for string.h 
package.c gets string.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for string.h in this
include file.

Bug: 19908228
Change-Id: I5db6d0a88c5b1eb9f582284e9bdd220c096ea69a
 2015-04-01 11:15:37 -07:00
Mohamad Ayyash
94cd52391c am a15881a9: am ed926596: am 6900d34e: Merge "Add verbose param to sparse_file_import_auto" 
* commit 'a15881a9e9d2951eda7a7a85fbaadd93bfb9da9b':
  Add verbose param to sparse_file_import_auto
 2015-04-01 18:04:50 +00:00
Richard Uhler
3f80c4d974 am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for both target and host." 
* commit '88defca0f5ee64143a83021e637b53908ed109ed':
  Define atrace_* functions for both target and host.
 2015-04-01 18:04:49 +00:00
Paul Lawrence
2c38321152 am ffe5c0d1: am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" 
* commit 'ffe5c0d12d15444f6440687a35972f1852436558':
  Revert "Revert "Adding e4crypt support""
 2015-04-01 18:01:27 +00:00
Paul Lawrence
ffe5c0d12d am 27cda9a5: Merge "Revert "Revert "Adding e4crypt support""" 
* commit '27cda9a535c80470e913156e412cbf7e60c3217c':
  Revert "Revert "Adding e4crypt support""
 2015-04-01 17:50:35 +00:00