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

26435 Commits

Author SHA1 Message Date
Charles He 21181e5297 Merge "[nit] Fix typo in properties.h" 
am: ded663c231

Change-Id: If7edd9aa3b06feeebf35585b53313b1b3b0ebf8e
 2016-12-15 17:31:42 +00:00
Treehugger Robot ded663c231 Merge "[nit] Fix typo in properties.h" 2016-12-15 17:22:04 +00:00
Charles He 40feda6ae9 [nit] Fix typo in properties.h 
Test: none
Change-Id: I6fe25bc9404c18bedc5802b3d830ede8a1bc28df
 2016-12-15 10:47:32 +00:00
Daichi Hirono 43418b52d7 Merge "Support SOCK_STREAM for bridge between system and app" 
am: 89ae81da76

Change-Id: I4f0832d0d54c7d08c42bfedb482adfd26f562366
 2016-12-15 07:04:23 +00:00
Treehugger Robot 89ae81da76 Merge "Support SOCK_STREAM for bridge between system and app" 2016-12-15 06:47:38 +00:00
Josh Gao ffb0576c7b Merge "adb: don't require adb keys to be named "*.adb_key"." 
am: 37883718a9

Change-Id: I0a1463180019960e92fbd3c06befcdc3c182f261
 2016-12-15 06:16:00 +00:00
Treehugger Robot 37883718a9 Merge "adb: don't require adb keys to be named "*.adb_key"." 2016-12-15 06:04:05 +00:00
Josh Gao a27666b823 adb: don't require adb keys to be named "*.adb_key". 
Don't require the extension on explicit file paths passed on; only
check for it in monitored directories.

Bug: http://b/33638233
Test: ADB_TRACE=1 ADB_VENDOR_KEYS=$HOME/foo adb server nodaemon
Change-Id: I7387e0bbe0f2e16878bf22b05d5c6e8d0f9e5a92
 2016-12-14 17:05:36 -08:00
Josh Gao f7d0ac101c Merge "adb: remove extraneous stat in sync_recv." 
am: e69e9be7b6

Change-Id: I357397b3b9b4bc90573c21c4053f62133973674b
 2016-12-14 21:20:39 +00:00
Tao Bao 431b41b320 Merge "init: Specify the data wipe reason." 
am: d9b9ebb887

Change-Id: I9e4ee4b3b2a46f8a293d761678e9b2f23ba0680f
 2016-12-14 21:20:26 +00:00
Treehugger Robot e69e9be7b6 Merge "adb: remove extraneous stat in sync_recv." 2016-12-14 21:11:23 +00:00
Treehugger Robot d9b9ebb887 Merge "init: Specify the data wipe reason." 2016-12-14 21:08:40 +00:00
Tao Bao fdf1a54f45 init: Specify the data wipe reason. 
We should say that if the data wipe is triggered by fs_mgr_mount_all.

Test: mmma system/core/init
Change-Id: I3998d9493611ecc286de0913a95cf22fc41100b5
 2016-12-14 12:12:32 -08:00
Sandeep Patil 571e246983 Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" 
am: 0a2080bced

Change-Id: I78ac944df86ff60d19573b7d0073e5ddd40427f2
 2016-12-14 19:35:33 +00:00
Treehugger Robot 0a2080bced Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" 2016-12-14 19:30:05 +00:00
Jorge Lucangeli Obes ec43ed7d46 Merge "Remove obsolete __BRILLO__ ifdef." 
am: a95e9aff7c

Change-Id: I5099d1c3949b6fd25d7bdaa0f671ec7eaf3d79a1
 2016-12-14 19:23:18 +00:00
Treehugger Robot a95e9aff7c Merge "Remove obsolete __BRILLO__ ifdef." 2016-12-14 19:14:08 +00:00
Jorge Lucangeli Obes 405da69b27 Remove obsolete __BRILLO__ ifdef. 
Confirmed with Brillo TL this is not needed.

Bug: 33620501
Test: Builds, boots on HiKey.
Change-Id: I8d6b7cc2a94e668d63421c456d38fe23877c3cf0
 2016-12-14 13:25:25 -05:00
dcashman 94eac36e98 Merge changes Ic190bd8c,I865044c8 
am: 5d0f40f7c5

Change-Id: Ibe4ce9712a788e4160d3ae24b18652c3684f90d7
 2016-12-14 17:43:48 +00:00
dcashman 69e2073ea3 Convert missed ERROR() to LOG(ERROR). 
am: 41d0b6d3ca

Change-Id: I4afd29b598d9822f9c0b17e0344964bad8245b57
 2016-12-14 17:43:47 +00:00
Elliott Hughes ac62fa1a40 Fix include order. 
am: 99dae54874

Change-Id: I1fab81b85b424d664ddc5dd2f277c60d7eafcb1e
 2016-12-14 17:43:41 +00:00
Treehugger Robot 5d0f40f7c5 Merge changes Ic190bd8c,I865044c8 
* changes:
  Convert missed ERROR() to LOG(ERROR).
  Fix include order.
 2016-12-14 17:36:25 +00:00
Daniel Cashman 877db0283c Merge "Set mmap_rnd_bits to maximum value." 
am: f03e6c8037

Change-Id: I1faebbc0b3c1c1ac01c3de2d845076a3555b943a
 2016-12-14 16:51:38 +00:00
Treehugger Robot f03e6c8037 Merge "Set mmap_rnd_bits to maximum value." 2016-12-14 16:40:04 +00:00
dcashman 41d0b6d3ca Convert missed ERROR() to LOG(ERROR). 
commit: f86b5a6b90 converted init to
libbase logging, but the internal resolution, commit:
4dc40842ba missed one.  Convert it.

Test: builds.
Change-Id: Ic190bd8ce232de0acadd980a349de95fa8aed8ad
 2016-12-14 08:38:23 -08:00
Elliott Hughes 99dae54874 Fix include order. 
(cherry-pick of commit: 79f2b33594)

Test: builds
Change-Id: I865044c8c54591582e7bb1b7a055cf7ba2f17464
 2016-12-14 08:16:07 -08:00
Daniel Cashman baccc40841 Set mmap_rnd_bits to maximum value. 
This is a cherry-pick of internal commit:
f611291688 which was a revert of a
revert, specifically a  revert of commit:
c8f026fc9c.

The above revert was meant only for AOSP, since the kernel prebuilts
were not yet available there.  The revert was reverted internally so
that internal builds, which have the appropriate kernel prebuilts,
operated properly.

The very first commit was originally done in nougat-dev and cherry-picked
to AOSP, so it was not picked up again when nougat landed in master.  Add
it now.

Bug: 27681085
Test: Builds and boots.
Change-Id: If1cb6308e61aaaabca5b5bd30df78aab49e7b0d5
 2016-12-14 07:48:36 -08:00
Daichi Hirono e3d8a883b2 Merge "Fix checks for reading and writing FuseMessage." 
am: d619026c07

Change-Id: Iaa0fd66e3f3fab3e9e9835aaefae36746c0450a3
 2016-12-14 08:01:38 +00:00
Treehugger Robot d619026c07 Merge "Fix checks for reading and writing FuseMessage." 2016-12-14 07:48:21 +00:00
Stephen Hines 87daae5505 Merge "Switch to memcpy for accessing misaligned data." 
am: 2bdb37190c

Change-Id: I3869562aef3d54316af6c72edf1fb8264ce28cb3
 2016-12-14 03:01:13 +00:00
Stephen Hines 2bdb37190c Merge "Switch to memcpy for accessing misaligned data." 2016-12-14 02:51:35 +00:00
Mark Salyzyn 4fee4601a5 Merge "liblog: clean up SafetyNet unit tests" 
am: 78b5f01051

Change-Id: If8dbe8eca771341516adf85aeb2ec98e75437041
 2016-12-14 02:33:21 +00:00
Treehugger Robot 78b5f01051 Merge "liblog: clean up SafetyNet unit tests" 2016-12-14 02:23:37 +00:00
Josh Gao b4360f4506 Merge "adb: add script to trace adbd." 
am: 963d95d188

Change-Id: I7cadbecf38b56ffdfd97b5364443ccc569ed17e4
 2016-12-14 01:12:16 +00:00
Josh Gao 963d95d188 Merge "adb: add script to trace adbd." 2016-12-14 01:06:55 +00:00
Christopher Ferris 39ce1328d3 Merge "Update for kernel headers v4.8.14." 
am: 0c0f042736

Change-Id: Iadbb62362350d836e4e6744915d1b30e6cd89b5d
 2016-12-13 23:47:53 +00:00
Christopher Ferris 0c0f042736 Merge "Update for kernel headers v4.8.14." 2016-12-13 23:40:01 +00:00
Josh Gao 52df920fd6 adb: add script to trace adbd. 
Bug: http://b/31289465
Test: sh trace.sh
Change-Id: Id6e20e83742541aec6bfd9f4112adbdadc078f74
 2016-12-13 14:31:17 -08:00
Mark Salyzyn a91b426268 liblog: clean up SafetyNet unit tests 
Move active code into helpers.

Test: gTest liblog-unit-tests
Change-Id: I5ade96edd71b7d773386f4d99eddbad076d10405
 2016-12-13 13:47:48 -08:00
Josh Gao 6f37e54508 Merge "adb: retry install_listener for a while." 
am: 2361ab0d31

Change-Id: I6d71a7badec82501a908fd0dd288897aa0797e49
 2016-12-13 04:10:05 +00:00
Treehugger Robot 2361ab0d31 Merge "adb: retry install_listener for a while." 2016-12-13 04:01:54 +00:00
Christopher Ferris 1514bb4f2f Update for kernel headers v4.8.14. 
Update sync.c to include the structurs from sw_sync.h. This uapi
header has been deleted.

Test: Built mips/arm/arm64/x86/x86_64. Built and booted angler.
Change-Id: I2495cb17b35f697fb8a2a00f6633ccb53f78293f
 2016-12-12 18:59:42 -08:00
Josh Gao f0f854bc76 adb: retry install_listener for a while. 
install_listener can fail if we told a previous adb server to quit and
it hasn't finished doing so yet. Retry it for a few hundred
milliseconds to avoid this.

Bug: http://b/28618716
Test: nc -l 5037; adb server nodaemon
Change-Id: Ibbda8f2718b85a2b6a08985aa8d29aa2204a3ead
 2016-12-12 18:20:57 -08:00
Josh Gao aac1145a5b adb: remove extraneous stat in sync_recv. 
We do a remote stat to get the file's size before pulling in sync_recv,
but all of the callers to sync_recv have already done a stat. Pass the
expected file size into sync_recv to remove its stat.

Bug: http://b/31289465
Test: python test_device.py
Change-Id: I7ca8ed11c6134e5954acac86626f880ade3ec696
 2016-12-12 16:47:34 -08:00
Elliott Hughes 88aa74b86f Merge "Revert "android_ids: move to bionic"" 
am: b0a15d8319

Change-Id: I858c898d058db9d835557a19b163f94a366ea7fa
 2016-12-13 00:42:30 +00:00
Josh Gao 2f78a3f6a5 Merge changes from topic 'adb_trace' 
am: 8e7c782eaa

Change-Id: I1545be5ffc0dedbeadf9efc3f275262bd3e8bfbc
 2016-12-13 00:42:11 +00:00
Josh Gao 2ae0d626ce adb: add tracing to transport.cpp. 
am: cfe72e290b

Change-Id: I9e1ab2db40dd0d0c066089e67e9cd06d792256fd
 2016-12-13 00:37:29 +00:00
Josh Gao 553413598e adb: clang-format transport.cpp 
am: 1290fbf5eb

Change-Id: I9b9ba18d99a39511ce598ef288b3a6199fe19aab
 2016-12-13 00:37:22 +00:00
Josh Gao 78f473602f adb: add tracing to file_sync_service.cpp. 
am: fd12aaa8c1

Change-Id: Id356cc3b533043f798594ec8cc8b32440581d50e
 2016-12-13 00:37:16 +00:00
Josh Gao 49d9efe777 cutils: add adb trace tag. 
am: e2d9732682

Change-Id: Iad5fbc8713db9b1a3ac1206f6d8610ae835ff36a
 2016-12-13 00:37:09 +00:00