openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,100 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

23100 Commits

Author SHA1 Message Date
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
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
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
Dimitry Ivanov 3f0a12622b Merge "Move linker-namespace functions declarations" 
am: 37ed923d1c

* commit '37ed923d1c08b8b9204a6a66f11bbf0b4375d35b':
  Move linker-namespace functions declarations

Change-Id: I91b184943a9a1cfa286f7e8ebb2df21f34063a3d
 2016-05-11 21:22:02 +00:00
Dimitry Ivanov c337cae9ad Move linker-namespace functions declarations 
They are intended for platform use only and we shouldn't have them
in the public header file. This CL moves them to libnativeloader
private header file.

Bug: http://b/28174921
Change-Id: I01cf446d2d8d7cf6f9e31130aa3d4e54fbbbb9fc
(cherry picked from commit 6796522256)
 2016-05-11 14:20:12 -07:00
Dimitry Ivanov 37ed923d1c Merge "Move linker-namespace functions declarations" 2016-05-11 21:14:41 +00:00
Elliott Hughes 53ec495b40 Report errno more often in fastboot. 
Change-Id: I4b4b47c584a146b38876a379f26ceb20d071c643
 2016-05-11 12:39:27 -07:00
Elliott Hughes 69541606c1 Merge "Add a fortify test to crasher." am: e674d32d2d 
am: 4434b42cd0

* commit '4434b42cd0bd36be4ca7702e840886f67daaff2d':
  Add a fortify test to crasher.

Change-Id: I3b8b473aa256b7de7ca5e50e14b32d0c3b0565e1
 2016-05-11 17:59:47 +00:00
Elliott Hughes 4434b42cd0 Merge "Add a fortify test to crasher." 
am: e674d32d2d

* commit 'e674d32d2d2816255c836cb7eed51eee6c9e8147':
  Add a fortify test to crasher.

Change-Id: I7d4c1342c514c73d195ad970703bb20338633db8
 2016-05-11 17:56:16 +00:00
Elliott Hughes e674d32d2d Merge "Add a fortify test to crasher." 2016-05-11 17:47:21 +00:00
Rob Herring e5636a3fce init: rework fixup_sys_perms to use perm_path_matches 
fixup_sys_perms does the same matching as the function perm_path_matches
other than the leading '/sys'. Adjust the path and use the common
matching function. Replace the fixed length C strings with std::string.

Change-Id: Ic09d91aa4ac1f1096018617537d782b82ee9ef63
Signed-off-by: Rob Herring <robh@kernel.org>
 2016-05-11 09:20:19 -05:00
Dimitry Ivanov 2be1699262 Merge "nativeloader: Ignore empty java_permitted_path" am: 39d1230ee3 
am: ed4c0be382

* commit 'ed4c0be382e87b09d08af82bd134970ceaaec3a4':
  nativeloader: Ignore empty java_permitted_path

Change-Id: Ib45cebd1cc2c8b9f64ebb7737c699930d374c5a9
 2016-05-11 07:43:34 +00:00
Dimitry Ivanov ed4c0be382 Merge "nativeloader: Ignore empty java_permitted_path" 
am: 39d1230ee3

* commit '39d1230ee31c704e95ec45048ff812a2b6aae5bf':
  nativeloader: Ignore empty java_permitted_path

Change-Id: Iab7b81414593760f4a9d5b02a5be3ea6f6b9720a
 2016-05-11 07:40:59 +00:00
Dimitry Ivanov 39d1230ee3 Merge "nativeloader: Ignore empty java_permitted_path" 2016-05-11 07:36:31 +00:00
Dimitry Ivanov d7cbb6f053 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev 
am: 6edd0c3a68

* commit '6edd0c3a68f60541c31fd65080e52939f2be3bc2':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I1777b3a05d2e233000815172cfa1e56326be634b
 2016-05-11 05:03:07 +00:00
Dimitry Ivanov 72ca40f738 nativeloader: Ignore empty java_permitted_path 
Passing empty permitted path should result in no-op.
This addresses review comment on CL with commit
f334cbf0e1

Bug: http://b/28639227
Change-Id: I4a4540e522e90a145a374939921932c86f35e88d
(cherry picked from commit d0b1531929)
 2016-05-10 22:02:05 -07:00
Dimitry Ivanov 6edd0c3a68 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev 2016-05-11 04:58:17 +00:00
Dimitry Ivanov ddc6a4a0a6 Merge "Check if public namespace has already been initialized" am: 0756fae4f1 
am: 5cd1e6822a

* commit '5cd1e6822abd016e5ee6e642528b39acaf15ae55':
  Check if public namespace has already been initialized

Change-Id: I13740764783765256af2fb1672fbfc5592147760
 2016-05-11 01:30:32 +00:00
Dimitry Ivanov 5cd1e6822a Merge "Check if public namespace has already been initialized" 
am: 0756fae4f1

* commit '0756fae4f1aea5072ed820087b2487b408194c38':
  Check if public namespace has already been initialized

Change-Id: Ia338baa984c3ca310f4a30db1d094704607e5cc9
 2016-05-11 01:27:55 +00:00
Dimitry Ivanov 0756fae4f1 Merge "Check if public namespace has already been initialized" 2016-05-11 01:23:20 +00:00
Dimitry Ivanov d0b1531929 nativeloader: Ignore empty java_permitted_path 
Passing empty permitted path should result in no-op.
This addresses review comment on CL with commit
f334cbf0e1

Bug: http://b/28639227
Change-Id: I4a4540e522e90a145a374939921932c86f35e88d
 2016-05-10 17:32:38 -07:00
Dimitry Ivanov 8f79183a11 Merge "Extend white-listed directories to include /mnt/expand" am: 3fb5f13806 
am: a5c037143c

* commit 'a5c037143c15118810e50d24bf43638d5f2e398e':
  Extend white-listed directories to include /mnt/expand

Change-Id: If007e28cc6d8618cb84b0e08a85a86cbd3b07d3c
 2016-05-10 23:24:31 +00:00
Dimitry Ivanov a5c037143c Merge "Extend white-listed directories to include /mnt/expand" 
am: 3fb5f13806

* commit '3fb5f1380671b6b9d3b511fc2b80051a14313dec':
  Extend white-listed directories to include /mnt/expand

Change-Id: I106dac170a9acb80835082916e6aa09328e5fb11
 2016-05-10 23:21:44 +00:00
Treehugger Robot 3fb5f13806 Merge "Extend white-listed directories to include /mnt/expand" 2016-05-10 23:17:27 +00:00