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

23805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg Hackmann
a11209b76b Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228 am: 6d28bd81f5 am: 1e18e78601 
am: 0a5f91b894

* commit '0a5f91b894c6d9bab9abb8f0ea1be858fbc7e64a':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: I406e3aa2d49d26d155de4e4ff026d20ccc7312d2
 2016-05-16 18:28:28 +00:00
Greg Hackmann
8415c61f03 Merge "SystemClock: add test" am: 282e8fb037 am: a91a1a990f am: 8f9a6372f6 
am: a71714964c

* commit 'a71714964c063d1be889dc55b385b57cf8775994':
  SystemClock: add test

Change-Id: I51cea906a2f3cc716f2089caf863982db968ab3d
 2016-05-16 18:28:28 +00:00
Greg Hackmann
0a5f91b894 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228 am: 6d28bd81f5 
am: 1e18e78601

* commit '1e18e78601b8ffd3e51f172ec3ed44640a4f4ff5':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: If8d414f9dbfbd799fa5b1baf673cdbfd422896a3
 2016-05-16 18:26:02 +00:00
Greg Hackmann
a71714964c Merge "SystemClock: add test" am: 282e8fb037 am: a91a1a990f 
am: 8f9a6372f6

* commit '8f9a6372f69f1528643cc24eab6048ab858b4997':
  SystemClock: add test

Change-Id: I4738ab2c9105099c92f5e583c9b5a2815dcc107e
 2016-05-16 18:26:01 +00:00
Greg Hackmann
1e18e78601 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228 
am: 6d28bd81f5

* commit '6d28bd81f55236d1a82f00f8ac568ad61a03128d':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: Id5ecad63fb6cd79cc7db641d992e9525bc2b8779
 2016-05-16 18:23:42 +00:00
Greg Hackmann
8f9a6372f6 Merge "SystemClock: add test" am: 282e8fb037 
am: a91a1a990f

* commit 'a91a1a990f1d629377dcd2c3f2b57ccab48dc8cf':
  SystemClock: add test

Change-Id: I547a4c3422eb468530e3cdd02eb2bb157a444a15
 2016-05-16 18:23:41 +00:00
Greg Hackmann
6d28bd81f5 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" 
am: e3ff256228

* commit 'e3ff25622840e8b79e30f7f8bda4715a103afb67':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: Id5a10854412308fb096a037977eea5e80931e1f8
 2016-05-16 18:21:23 +00:00
Greg Hackmann
a91a1a990f Merge "SystemClock: add test" 
am: 282e8fb037

* commit '282e8fb037031fa8de02dd3ea5a6944c5d24f4d8':
  SystemClock: add test

Change-Id: Id45600a898ae89ae7a1be262f5655f30eed22205
 2016-05-16 18:21:22 +00:00
Badhri Jagan Sridharan
3d5f35d409 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 am: 30c9aed0be am: 348f3590f0 
am: 981925e6d2

* commit '981925e6d2b6121e839e1d6534576ae23bf1f3f3':
  fs_mgr: update block device reference in verity metadata

Change-Id: I732d9fced42c623b4786a82d3264877bf4307df5
 2016-05-16 18:19:10 +00:00
Treehugger Robot
e3ff256228 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" 2016-05-16 18:18:57 +00:00
Treehugger Robot
282e8fb037 Merge "SystemClock: add test" 2016-05-16 18:18:30 +00:00
Jeremy Compostella
981925e6d2 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 am: 30c9aed0be 
am: 348f3590f0

* commit '348f3590f0c758916f7c27d47b00d40e609baf63':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ie8dcf633b193afd63803d8a0390cf203bda8857d
 2016-05-16 18:16:38 +00:00
Badhri Jagan Sridharan
348f3590f0 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 
am: 30c9aed0be

* commit '30c9aed0becc77a31a2b86b8683db5630fc95024':
  fs_mgr: update block device reference in verity metadata

Change-Id: I2d024cefaa15b62cb6b0ffa6fe57c904304c5160
 2016-05-16 18:13:45 +00:00
Jeremy Compostella
30c9aed0be Merge "fs_mgr: update block device reference in verity metadata" 
am: 4cefb91611

* commit '4cefb91611912dd7a3f8059ee2b993cec2d0b9bb':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ia734c90ea25168060fc20b13f8b88de11d5e7568
 2016-05-16 18:11:23 +00:00
Badhri Jagan Sridharan
4cefb91611 Merge "fs_mgr: update block device reference in verity metadata" 2016-05-16 18:06:38 +00:00
Elliott Hughes
de2aa9b64d Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 am: ed95190b69 am: cb4abee6ca 
am: 07d0a44e08

* commit '07d0a44e0808855a70cb99d076a1f365eb3d0ecd':
  Don't expose ashmem constants on the host.

Change-Id: I4026ba6a0d50c990cbdea9aecf3f9f164c83c60c
 2016-05-16 17:41:11 +00:00
Elliott Hughes
07d0a44e08 Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 am: ed95190b69 
am: cb4abee6ca

* commit 'cb4abee6caecdc42c6bcc2f48e824c4708df0874':
  Don't expose ashmem constants on the host.

Change-Id: I12befdeaa87adb1dbadc63689836a21aa4f9019f
 2016-05-16 17:37:56 +00:00
Elliott Hughes
cb4abee6ca Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 
am: ed95190b69

* commit 'ed95190b690adf3a452001fc527881af913c5ccd':
  Don't expose ashmem constants on the host.

Change-Id: I930dd0b72e88647b1e94694e5fb183431c7d75c6
 2016-05-16 17:34:13 +00:00
Elliott Hughes
ed95190b69 Merge "Don\'t expose ashmem constants on the host." 
am: 54fed512b9

* commit '54fed512b9846a024332deb8bdffe0ee5ce784e0':
  Don't expose ashmem constants on the host.

Change-Id: I5550cd35693a6c7d6e68880018b2acbc9caa90a6
 2016-05-16 17:31:06 +00:00
Elliott Hughes
54fed512b9 Merge "Don't expose ashmem constants on the host." 2016-05-16 17:23:52 +00:00
Jeremy Compostella
dfd2478bd1 fs_mgr: update block device reference in verity metadata 
The dm-verity metadata contains the block device path that is given to
the dm-android-verity driver.  If the device is using slot A/B, this
path is missing the slot suffix.

This patch makes fs_mgr replace all the block device path reference
with the one including the active slot suffix.

Change-Id: Ib624d0d18b12a8a287cac7f15605a2e0fb7c97c6
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
 2016-05-16 16:37:24 +00:00
Michael Wright
3188fad0b5 Merge "Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b am: 3fe4a71e5f" into nyc-mr1-dev-plus-aosp 
am: db724a850a

* commit 'db724a850aa04489b3a8dea215d1044a3e88756c':

Change-Id: I5e2c5a267731207aa8e76a7b6a031cfa647e8280
 2016-05-16 14:24:24 +00:00
Michael Wright
2d7f5ccd7b Merge "Merge commit \'3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87\' into manual_merge_3fe4a71" into nyc-mr1-dev-plus-aosp 
am: 0af057d502

* commit '0af057d502db87710794975a966ab97cd8ad758e':

Change-Id: I6179fe4703b1bcce8ab17bdbfcc409120fe166f0
 2016-05-16 14:24:23 +00:00
Android Build Merger (Role)
db724a850a Merge "Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b am: 3fe4a71e5f" into nyc-mr1-dev-plus-aosp 2016-05-16 14:21:41 +00:00
Michael Wright
a0f75f0512 Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b 
am: 3fe4a71e5f

* commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87':

Change-Id: I65a71f372aa0656b6665d84d340851f0d02a12ae
 2016-05-16 14:21:32 +00:00
Michael Wright
3bbe1f0f55 Merge commit \'8b452b876b90dcfff1dab9012b65b5e67c4531a4\' into manual_merge_8b452b8 am: 2a9a993af9 
am: e26e1819cb

* commit 'e26e1819cbcc17eedfc2d802529c3c5e2bde794d':
  Add String16#contains and strstr16 methods.

Change-Id: Id6def0c7f5ed876226e0fec9b9e409c2f43738c2
 2016-05-16 14:21:30 +00:00
Michael Wright
0af057d502 Merge "Merge commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87' into manual_merge_3fe4a71" into nyc-mr1-dev-plus-aosp 2016-05-16 14:20:45 +00:00
Michael Wright
e26e1819cb Merge commit \'8b452b876b90dcfff1dab9012b65b5e67c4531a4\' into manual_merge_8b452b8 
am: 2a9a993af9

* commit '2a9a993af99585af0bce6eca6d92c86370977a27':
  Add String16#contains and strstr16 methods.

Change-Id: Icaa1c7f8d458d6f2651c72b376116e6952be9910
 2016-05-16 14:18:34 +00:00
Michael Wright
63d67dd5f0 Merge commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87' into manual_merge_3fe4a71 
Change-Id: I3cf8d1a1d4617431484da3317ab56311a108dc9b
 2016-05-16 15:16:27 +01:00
Michael Wright
2a9a993af9 Merge commit '8b452b876b90dcfff1dab9012b65b5e67c4531a4' into manual_merge_8b452b8 
Change-Id: Iacdc2d521f669661b4979c03b0476512abdb37c7
 2016-05-16 15:06:22 +01:00
Michael Wright
3fe4a71e5f Merge "Add String16#contains and strstr16 methods." into nyc-dev 
am: 8b452b876b

* commit '8b452b876b90dcfff1dab9012b65b5e67c4531a4':
  Add String16#contains and strstr16 methods.

Change-Id: I4174527fa81cc725eb874c664c66b75319534d8f
 2016-05-16 13:27:57 +00:00
TreeHugger Robot
8b452b876b Merge "Add String16#contains and strstr16 methods." into nyc-dev 2016-05-16 13:21:11 +00:00
Patrick Tjin
f44442215d Create symlink in the case where device has no cache partition am: c6535a343f 
am: 31788415ed

* commit '31788415ed6d89eba11ee757f04ff32ee260a7c1':
  Create symlink in the case where device has no cache partition

Change-Id: Ic5813d8f9fab4a02d6e0fab4add2fa0a8a72c008
 2016-05-14 03:39:11 +00:00
Patrick Tjin
31788415ed Create symlink in the case where device has no cache partition 
am: c6535a343f

* commit 'c6535a343f0b0bdd0f4171f0b4c9be401beebf77':
  Create symlink in the case where device has no cache partition

Change-Id: Ibcec898104e6509e70647576611ecc7d887f163d
 2016-05-14 03:36:41 +00:00
Patrick Tjin
c6535a343f Create symlink in the case where device has no cache partition 
Create symlink from /cache to /data/cache for devices
which have no cache partition.

Bug: 28747374
Change-Id: Ifb0c3250f1be345ce46fcdb78533e36c2250bb85
 2016-05-13 15:25:04 -07:00
Rob Herring
ad300bf987 Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 am: 0da9f42f2c am: a0c90085ec 
am: 9582b1a3f1

* commit '9582b1a3f16e3bf492af38ec166eb6d23f65cedf':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: Id1d9a1db1d677164347f5d3092b4d3c33292dd30
 2016-05-13 22:00:25 +00:00
Rob Herring
9582b1a3f1 Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 am: 0da9f42f2c 
am: a0c90085ec

* commit 'a0c90085ecd2477e8ccdcc7155e92ab38a8e928c':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: I1cec0aabbc48581dd3d049a1948fbd99b708a386
 2016-05-13 21:57:31 +00:00
Rob Herring
a0c90085ec Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 
am: 0da9f42f2c

* commit '0da9f42f2c2ec6985018ad45603b32532d096a60':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: Ifc85ba3205a5207a4285da94b483164490dbde4d
 2016-05-13 21:54:48 +00:00
Rob Herring
0da9f42f2c Merge "init: support matching sysfs class paths in ueventd.rc" 
am: faa14b94d5

* commit 'faa14b94d5a6d0c3d429516bf226b9836f65da91':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: Icb642a52ec834d450b2f7357b63370021986a06e
 2016-05-13 21:52:06 +00:00
Elliott Hughes
427c605b2a Don't expose ashmem constants on the host. 
Change-Id: I86bf58841645114e382300228be7be69a555e76b
 2016-05-13 14:47:30 -07:00
Treehugger Robot
faa14b94d5 Merge "init: support matching sysfs class paths in ueventd.rc" 2016-05-13 21:38:12 +00:00
Rob Herring
6de783af07 init: support matching sysfs class paths in ueventd.rc 
Currently, ueventd.rc files only support /sys/devices/... paths
and don't support symlinked paths, specifically /sys/class/...
Supporting the class paths is necessary to have non-hardware
dependent paths. Some subsystems like IIO use /sys/bus/iio/, so
support that as well.

Change-Id: I29f3bf67b41664d1d75ac1820c46e13afe336d56
Signed-off-by: Rob Herring <robh@kernel.org>
 2016-05-13 13:46:46 -07:00
Rob Herring
8b7d2a24da Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 am: e7028e3d38 am: 7aef62751b 
am: fe56b450e9

* commit 'fe56b450e9d75b2a1863d395d48acaeacde7ac63':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: I90e7f682752919699259a1871a7f5014249b64eb
 2016-05-13 20:38:27 +00:00
Rob Herring
fe56b450e9 Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 am: e7028e3d38 
am: 7aef62751b

* commit '7aef62751bd8a070c6d3d9b45987b0ed6d495658':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: I96210ae1c1e1a90ee482a430cd40f9f1b9169e4a
 2016-05-13 20:35:59 +00:00
Rob Herring
7aef62751b Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 
am: e7028e3d38

* commit 'e7028e3d382ee4099cfc4c1cbfa650fd2f820410':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: Iaebea1a143b053ee1c41c47cb5eb2329f992330f
 2016-05-13 20:33:28 +00:00
Rob Herring
e7028e3d38 Merge "init: rework fixup_sys_perms to use perm_path_matches" 
am: 0504a94cd9

* commit '0504a94cd9a1f6f5788051fceba6fb2d4bcc3615':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: Ibfc3562cbc32326faa4e857e9b3a52b4a359c5c0
 2016-05-13 20:30:52 +00:00
Treehugger Robot
0504a94cd9 Merge "init: rework fixup_sys_perms to use perm_path_matches" 2016-05-13 20:23:44 +00:00
Mohamad Ayyash
46807bc3a3 Merge "Move canned_fs_config into libcutils" am: e62cec6e39 am: b44077d8bf am: d21c737db4 
am: 6efba6a826

* commit '6efba6a8260bb09fa297aeec85e535e28e8914c3':
  Move canned_fs_config into libcutils

Change-Id: I979d157a6b3ee5c11871d4dfbd7193db7df94aa8
 2016-05-13 18:30:58 +00:00
Mohamad Ayyash
6efba6a826 Merge "Move canned_fs_config into libcutils" am: e62cec6e39 am: b44077d8bf 
am: d21c737db4

* commit 'd21c737db46818805691dea127ef260cc722cf77':
  Move canned_fs_config into libcutils

Change-Id: I896702baf951bf9c07b1cf8859b2d10bbd047251
 2016-05-13 18:27:28 +00:00
Mohamad Ayyash
d21c737db4 Merge "Move canned_fs_config into libcutils" am: e62cec6e39 
am: b44077d8bf

* commit 'b44077d8bfc719851dee30c5a831fc567d710d2b':
  Move canned_fs_config into libcutils

Change-Id: If295243e346b89c66ecf114ee889b7d821bce3ac
 2016-05-13 18:24:59 +00:00