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

23124 commits

This branch
This branch
All branches
Author SHA1 Message Date
Josh Gao
8781256b19 Merge "adb/base: allow use of unique_fd inside adb." am: 210fdc2742 
am: 881b440b7a

* commit '881b440b7a228e065d4b42ec71add07fbcb336c4':
  adb/base: allow use of unique_fd inside adb.

Change-Id: Ib1c437bcc6462235b8a753fb8cdedb9ff7261e9c
 2016-05-16 22:02:55 +00:00
Josh Gao
881b440b7a Merge "adb/base: allow use of unique_fd inside adb." 
am: 210fdc2742

* commit '210fdc2742d3cadaa2f8255ad22b4a2b7bdbf743':
  adb/base: allow use of unique_fd inside adb.

Change-Id: Ic7d36d38343f46a541452ca6f6b622f3c5c74c26
 2016-05-16 21:56:56 +00:00
Treehugger Robot
210fdc2742 Merge "adb/base: allow use of unique_fd inside adb." 2016-05-16 21:42:02 +00:00
Badhri Jagan Sridharan
7e11db1b32 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 
am: b61ecb5213

* commit 'b61ecb5213e1c94e823f23d7f5a8a0a93db617d6':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I5fc733ee946b4d0accf58f56c80270f9e13d9f63
 2016-05-16 19:43:50 +00:00
Winter Wang
b61ecb5213 Merge "init: usb: disable usb function switch until adbd is ready" 
am: 2a26c2a836

* commit '2a26c2a836af9109ce4aa6cf8128a385d14878d3':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I406d35a4c6a18e2d84d49450a72a1bc3be7233ee
 2016-05-16 19:41:31 +00:00
Badhri Jagan Sridharan
2a26c2a836 Merge "init: usb: disable usb function switch until adbd is ready" 2016-05-16 19:34:51 +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
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
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
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
2a9a993af9 Merge commit '8b452b876b90dcfff1dab9012b65b5e67c4531a4' into manual_merge_8b452b8 
Change-Id: Iacdc2d521f669661b4979c03b0476512abdb37c7
 2016-05-16 15:06:22 +01:00
TreeHugger Robot
8b452b876b Merge "Add String16#contains and strstr16 methods." into nyc-dev 2016-05-16 13:21:11 +00:00
Josh Gao
13ea01db45 adb/base: allow use of unique_fd inside adb. 
adb implements its own file descriptor emulation layer on Windows,
which requires the use of adb_close instead of close throughout the
codebase. Add a template argument to unique_fd that allows for this.

Bug: http://b/28347842
Change-Id: I6397261f4973d49f2f8e04257bf67b348585bb63
 2016-05-14 18:25:51 -07: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
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
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
Mohamad Ayyash
b44077d8bf Merge "Move canned_fs_config into libcutils" 
am: e62cec6e39

* commit 'e62cec6e39839c1dc71ec7be6e5b361e3514c388':
  Move canned_fs_config into libcutils

Change-Id: I3e47664218061a5a6268db9de6a669d6b5e58b03
 2016-05-13 18:22:48 +00:00
Treehugger Robot
e62cec6e39 Merge "Move canned_fs_config into libcutils" 2016-05-13 18:13:22 +00:00
David Pursell
1e57ab6f7b Merge "adb: support forwarding TCP port 0." am: cb90562bcf 
am: 5aaffac37e

* commit '5aaffac37e2b2b32e645c0c03c96a88a3133b3ae':
  adb: support forwarding TCP port 0.

Change-Id: I2e7bd29de76a87b80e71ce00ed2da4666f3cbb56
 2016-05-13 15:21:04 +00:00
David Pursell
5aaffac37e Merge "adb: support forwarding TCP port 0." 
am: cb90562bcf

* commit 'cb90562bcfb36a31fc5ced592bf321b370e67d15':
  adb: support forwarding TCP port 0.

Change-Id: Icb872f79b4768d1a730db7cac5f6eb1b15f3d966
 2016-05-13 15:17:46 +00:00
David Pursell
cb90562bcf Merge "adb: support forwarding TCP port 0." 2016-05-13 15:12:51 +00:00
Mohamad Ayyash
8374276bfa Move canned_fs_config into libcutils 
It's no longer specific to make_ext4fs, will be used for mksquashfs as
well.

BUG: 27467028
Change-Id: I41b8c2b168ada45c8378dee522391edfb8f6b9a6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG: 28704419
 2016-05-12 18:44:13 -07:00
Irina Patru
12397f202f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 
am: 2618d90c2f

* commit '2618d90c2fa3f952a195dfd4ecd9f92ec462bccb':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I2663c368032a3c9f851de7d1e47f68c3a25b0d52
 2016-05-12 18:13:14 +00:00
Irina Patru
2618d90c2f Merge "init.rc: Remove cpu weight set on the root cgroup" 
am: 422492c506

* commit '422492c5063956e4f69bdbe01a30b0bc54a5fb2c':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I23bf6dda65cc795efc0babb5a8806e74fd0e7ed1
 2016-05-12 18:10:07 +00:00
Treehugger Robot
422492c506 Merge "init.rc: Remove cpu weight set on the root cgroup" 2016-05-12 18:05:46 +00:00
Mark Salyzyn
5d76be85a4 Merge "liblog: sleep 20ms before critical property_set" am: 1d560ff24a 
am: 03ac8fe0be

* commit '03ac8fe0be882b09d7faba4d5f96e536a94198ab':
  liblog: sleep 20ms before critical property_set

Change-Id: I91d3262a478f83556851881208fb1f83de62f189
 2016-05-12 16:48:21 +00:00
Mark Salyzyn
03ac8fe0be Merge "liblog: sleep 20ms before critical property_set" 
am: 1d560ff24a

* commit '1d560ff24a30dfac9f8e71847883ca4fef5f953c':
  liblog: sleep 20ms before critical property_set

Change-Id: I09197251d8ba5efb87c47e3e496bfe1c826e8688
 2016-05-12 16:45:51 +00:00
Treehugger Robot
1d560ff24a Merge "liblog: sleep 20ms before critical property_set" 2016-05-12 16:38:07 +00:00
Mark Salyzyn
5cceee6404 liblog: sleep 20ms before critical property_set 
Going too fast can result in the property not being set
and causing an extreme corner case failure being reported
and blamed on is_loggable functionality.

Bug: 25792367
Change-Id: Idda6f67d655d8a84d2809daf695394d5293e7431
 2016-05-12 15:58:57 +00:00
Irina Patru
c560c6310f init.rc: Remove cpu weight set on the root cgroup 
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
 2016-05-12 14:57:31 +03:00
Dimitry Ivanov
f031971771 Move linker-namespace functions declarations 
am: c337cae9ad

* commit 'c337cae9adcb538a4562641f97bdde933d085a82':
  Move linker-namespace functions declarations

Change-Id: Iab15bb8cf23a5fa342f7c51d05322ccd6c54958e
 2016-05-12 00:45:33 +00:00
Elliott Hughes
7f80f04a2c Merge "Report errno more often in fastboot." am: 8c5384e50b 
am: 272b2694cd

* commit '272b2694cd3556120a3e39b88a0702103e2ed58a':
  Report errno more often in fastboot.

Change-Id: Ie26d2c70e65b70c08017f848f21fb91d6f20e3a4
 2016-05-11 21:50:07 +00:00
Elliott Hughes
272b2694cd Merge "Report errno more often in fastboot." 
am: 8c5384e50b

* commit '8c5384e50bfbc97e4b4ea74e52391879a09b68fa':
  Report errno more often in fastboot.

Change-Id: I19a33597f29c1974063d4308eeccea60bbb350f5
 2016-05-11 21:39:00 +00:00
Dimitry Ivanov
17decbd637 Merge "Move linker-namespace functions declarations" am: 37ed923d1c 
am: 3f0a12622b

* commit '3f0a12622b8d35f1223945498a086e19c791bf24':
  Move linker-namespace functions declarations

Change-Id: I6f3e8b5ef608e3b930510b5c483ec6e7963eb4f7
 2016-05-11 21:29:15 +00:00
Elliott Hughes
8c5384e50b Merge "Report errno more often in fastboot." 2016-05-11 21:27:44 +00:00