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

58624 Commits

Author SHA1 Message Date
Automerger Merge Worker bc38881fd9 Merge changes Ic2af40b8,I9c8cfebe am: 824f0095b0 am: 025b239f1e 
Change-Id: I32278a67a749651c02b04cf41eb4d43eb61e7e7d
 2020-03-03 06:53:22 +00:00
Automerger Merge Worker 025b239f1e Merge changes Ic2af40b8,I9c8cfebe am: 824f0095b0 
Change-Id: I239af47affe95ebbf3f019e579cbe050e1d5766d
 2020-03-03 06:38:55 +00:00
Treehugger Robot 824f0095b0 Merge changes Ic2af40b8,I9c8cfebe 
* changes:
  Reland "adb: turn CHECKs into an error + transport restart."
  Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
 2020-03-03 06:29:55 +00:00
Automerger Merge Worker a806b70d2c Merge "Disable AdbPairingConnectionTest#MultipleClientsOnePass." am: 49d4dd23ca am: 670c58dbd8 
Change-Id: I7f532a4b648d15abeb4bf1e93574b6f1a3f3944a
 2020-03-03 01:05:50 +00:00
Automerger Merge Worker 758edd200e Merge "fs_mgr: remain elapsed time of fsck in prop" am: 5d4855680d am: 115af190e2 
Change-Id: I92775b59e6eeb7708b3b749af171685d5a115d30
 2020-03-03 01:05:33 +00:00
Automerger Merge Worker 670c58dbd8 Merge "Disable AdbPairingConnectionTest#MultipleClientsOnePass." am: 49d4dd23ca 
Change-Id: I2a8a1dc3bbe26c5a88df8259c215bde32b39868a
 2020-03-03 00:47:39 +00:00
Automerger Merge Worker 115af190e2 Merge "fs_mgr: remain elapsed time of fsck in prop" am: 5d4855680d 
Change-Id: I057410e062f702c8543e5c9ca9f02c926d80c023
 2020-03-03 00:47:32 +00:00
Automerger Merge Worker e6ae555407 Merge "fs_mgr: remain elapsed time of fsck in prop" into rvc-dev am: 9e1bcc25f9 
Change-Id: I2eb77175535ff33e6be1677f1edd7a2211af4e56
 2020-03-03 00:43:00 +00:00
Jaegeuk Kim 9e1bcc25f9 Merge "fs_mgr: remain elapsed time of fsck in prop" into rvc-dev 2020-03-03 00:37:17 +00:00
Joshua Duong 49d4dd23ca Merge "Disable AdbPairingConnectionTest#MultipleClientsOnePass." 2020-03-03 00:36:22 +00:00
Automerger Merge Worker ef9022bcd2 [automerger skipped] Merge "fsck.f2fs: enable cache" into rvc-dev am: 552729b9d6 -s ours 
am skip reason: Change-Id I8f5a9701442302339f7b5880133a960e89114b55 with SHA-1 c461e16d05 is in history

Change-Id: I4b0766c026a94c2f596dd311efcfdbc38261de6f
 2020-03-03 00:35:09 +00:00
Jaegeuk Kim 34da2061d4 fs_mgr: remain elapsed time of fsck in prop 
Bug: 149595111
Bug: 149844577
Bug: 138909685
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I8f11ca2680558dc54efd6788ee0dd56e5d65a356
Merged-In: I8f11ca2680558dc54efd6788ee0dd56e5d65a356
 2020-03-03 00:35:04 +00:00
Jaegeuk Kim 5d4855680d Merge "fs_mgr: remain elapsed time of fsck in prop" 2020-03-03 00:33:49 +00:00
TreeHugger Robot 552729b9d6 Merge "fsck.f2fs: enable cache" into rvc-dev 2020-03-03 00:21:32 +00:00
Josh Gao 7b3048446d Reland "adb: turn CHECKs into an error + transport restart." 
This reverts commit 2547f740ea.

Bug: http://b/134695864
Bug: http://b/133872605
Test: manually unplugged/replugged
Change-Id: Ic2af40b81354138a7842eb93aacc303885ac952e
 2020-03-02 13:55:04 -08:00
Josh Gao bfe3dac36d Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor" 
This reverts commit ba4684c2b2.

Bug: http://b/129283234
Test: manually unplugged/replugged
Change-Id: I9c8cfebe09b2855cab986068273a835a13247b77
 2020-03-02 13:45:52 -08:00
Automerger Merge Worker 4461fa9d8e [automerger skipped] Allowing R and S developer GSI for DSU am: 99651b012b -s ours am: 0f52deaf32 -s ours 
am skip reason: Change-Id I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb with SHA-1 a2ac846ff3 is in history

Change-Id: I3bc949a6e4d4fc2e2c6ea355b38c8c2b7f3a1f8a
 2020-03-02 21:40:36 +00:00
Automerger Merge Worker 5d7c38439e [automerger skipped] Adding new GSI public keys am: 14b8c451c4 -s ours am: c4f86ac7a6 -s ours 
am skip reason: Change-Id Iaa7521ef40b94f13fe3c9c61d276678f47c60b98 with SHA-1 b697d47eb3 is in history

Change-Id: Ia4158acaac779bd4aa59f1679f2025230d67013c
 2020-03-02 21:40:34 +00:00
Automerger Merge Worker 0f52deaf32 [automerger skipped] Allowing R and S developer GSI for DSU am: 99651b012b -s ours 
am skip reason: Change-Id I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb with SHA-1 a2ac846ff3 is in history

Change-Id: Ib423d80893de7cf45e231221764b1e1d99ea21bb
 2020-03-02 21:30:48 +00:00
Automerger Merge Worker c4f86ac7a6 [automerger skipped] Adding new GSI public keys am: 14b8c451c4 -s ours 
am skip reason: Change-Id Iaa7521ef40b94f13fe3c9c61d276678f47c60b98 with SHA-1 b697d47eb3 is in history

Change-Id: Ib97982ceb61dc853f2080ec8205e7cff7ced2b65
 2020-03-02 21:30:46 +00:00
Joshua Duong 2e1ee8ee51 Disable AdbPairingConnectionTest#MultipleClientsOnePass. 
Will re-enable once flaky failure is fixed.

Bug: 150529485
Bug: 150388912

Test: atest adb_pairing_connection_test doesn't run above test.
Change-Id: I63ac3fc2fd2d289b977dd3b9f6eccfb65866769c
 2020-03-02 12:56:59 -08:00
Automerger Merge Worker 010b1e2aec Merge changes Ib97acc6d,I8f14004a,Id5bbfd6d,I4dfc3f52 into rvc-dev am: 9978c36754 
Change-Id: Ie99d548566da80e728cb404bca4ef5fa408a1c00
 2020-03-02 20:47:27 +00:00
Automerger Merge Worker 536567b114 [automerger skipped] Merge changes Iac986bca,I0f40b1f2 into rvc-dev am: acb49fd07d -s ours 
am skip reason: Change-Id Ie4313c7add5c71bb9614a4d97eec41329425f23d with SHA-1 478e1c191c is in history

Change-Id: I654c493ac53f14d65709d88fec10b216bff66703
 2020-03-02 20:47:21 +00:00
Josh Gao 9978c36754 Merge changes Ib97acc6d,I8f14004a,Id5bbfd6d,I4dfc3f52 into rvc-dev 
* changes:
  adbd: add runtime-configurable logging.
  adb: don't hardcode ports in test_adb.
  adbd: add usb thread spawn logging.
  base: add CachedProperty.
 2020-03-02 20:46:15 +00:00
Josh Gao bbe3385097 adbd: add runtime-configurable logging. 
Add some requested logging options that can be turned on at runtime
without having to restart adbd.

Bug: http://b/141959374
Test: manual
Change-Id: Ib97acc6d199e0b91238a6758e18b7cb75f8688d9
(cherry picked from commit 52d0b67f19)
 2020-03-02 12:44:54 -08:00
Josh Gao 9ddc42aa93 adb: don't hardcode ports in test_adb. 
If we get unlucky and something else (or ourselves, in another thread)
beats us to listening on our hardcoded ports, we can deadlock.

Bug: http://b/149829737
Test: ./test_adb.py
Change-Id: I8f14004a6b2e77366abad6e88786ea8941629020
(cherry picked from commit e8829c6bfc)
 2020-03-02 12:44:50 -08:00
David Anderson acb49fd07d Merge changes Iac986bca,I0f40b1f2 into rvc-dev 
* changes:
  snapshotctl: Not necessary to link to libdm.
  libdm: Make static std::string inline for DmTargetDefaultKey.
 2020-03-02 20:31:56 +00:00
Automerger Merge Worker 484bbf809d Merge "fsck.f2fs: enable cache" am: 6576db1d1c am: 7ca2c0ddf2 
Change-Id: Ibabf5d441aaa0df19537418873765b69d4cc7a63
 2020-03-02 19:51:08 +00:00
Automerger Merge Worker 7ca2c0ddf2 Merge "fsck.f2fs: enable cache" am: 6576db1d1c 
Change-Id: I8e79b35a9a3bc7dd7565319998b1746e591938af
 2020-03-02 19:32:53 +00:00
Jaegeuk Kim ba446ce785 fsck.f2fs: enable cache 
Bug: 149418646
Bug: 149844577
Bug: 111241572
Bug: 134988435
Change-Id: I8f5a9701442302339f7b5880133a960e89114b55
Merged-In: I8f5a9701442302339f7b5880133a960e89114b55
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2020-03-02 19:19:16 +00:00
Treehugger Robot 6576db1d1c Merge "fsck.f2fs: enable cache" 2020-03-02 19:18:27 +00:00
Automerger Merge Worker 0020a9f3a8 [automerger skipped] Merge "Reset post_data_ and services_update_finished_ on userspace reboot" into rvc-dev am: efab99063d -s ours 
am skip reason: Change-Id I77d47a8460b1526337a318547a59141334e11cdd with SHA-1 3ad292025c is in history

Change-Id: Iaf66e158f28bd00ed8d80845827595ee62b5005e
 2020-03-02 18:40:41 +00:00
Automerger Merge Worker 6ff2259425 [automerger skipped] Merge "Revert "liblog: disable header_abi_checker"" into rvc-dev am: 1405f22b32 -s ours 
am skip reason: Change-Id I93553da6207976c83091f21936b0ecdd31e82848 with SHA-1 cfcf684c83 is in history

Change-Id: I9f1ebf442ebb95d9c909469ac54031f4804db7af
 2020-03-02 18:39:21 +00:00
Nikita Ioffe efab99063d Merge "Reset post_data_ and services_update_finished_ on userspace reboot" into rvc-dev 2020-03-02 18:01:54 +00:00
Tom Cherry 1405f22b32 Merge "Revert "liblog: disable header_abi_checker"" into rvc-dev 2020-03-02 17:56:59 +00:00
Tom Cherry d5d2c6a4fa Revert "liblog: disable header_abi_checker" 
All planned changes to liblog have been made, so it's time to
re-enable this.

This reverts commit 896fb9e57a.

Bug: 150608248
Test: build
(cherry picked from commit cfcf684c83)
Merged-In: I93553da6207976c83091f21936b0ecdd31e82848
Change-Id: I93553da6207976c83091f21936b0ecdd31e82848
 2020-03-02 17:56:23 +00:00
Jaegeuk Kim c461e16d05 fsck.f2fs: enable cache 
Bug: 149418646
Bug: 149844577
Bug: 111241572
Bug: 134988435
Change-Id: I8f5a9701442302339f7b5880133a960e89114b55
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2020-03-02 09:18:53 -08:00
Automerger Merge Worker 0caf221a01 [automerger skipped] Merge "logwrap: add missing O_CLOEXEC" into rvc-dev am: 9fb0c55c24 -s ours 
am skip reason: Change-Id Ibe070d5d4f3a7ada0718f74c7cee12db7b9f920e with SHA-1 b5b162e204 is in history

Change-Id: Ica1da7593c35dd3c1ed3da181d329662f8aa2ac5
 2020-03-02 17:04:49 +00:00
Tom Cherry 9fb0c55c24 Merge "logwrap: add missing O_CLOEXEC" into rvc-dev 2020-03-02 16:49:56 +00:00
Automerger Merge Worker 31a64ed187 Merge "Observe new apexd status value of "activated" as required." am: 2f11663fc9 am: f53cca4d26 
Change-Id: I8ea819407b50d3ce632f5b987507a7807de60bd4
 2020-03-02 10:47:07 +00:00
Automerger Merge Worker f53cca4d26 Merge "Observe new apexd status value of "activated" as required." am: 2f11663fc9 
Change-Id: I9d279cc422fcae2bf8828081d7304de10baf9832
 2020-03-02 10:33:47 +00:00
Oli Lan 2f11663fc9 Merge "Observe new apexd status value of "activated" as required." 2020-03-02 10:24:21 +00:00
Automerger Merge Worker 7b774dca8c Merge "Fix missing Result::ok() call in init" am: 8d144f6612 am: aebe5f91b0 
Change-Id: If859f8d559874c905960c72e5a659491776f2c3d
 2020-03-01 15:33:37 +00:00
Automerger Merge Worker aebe5f91b0 Merge "Fix missing Result::ok() call in init" am: 8d144f6612 
Change-Id: I37ecbf07fe122fa4998f3cb174e96e49b94f5181
 2020-03-01 15:24:03 +00:00
Bernie Innocenti 8d144f6612 Merge "Fix missing Result::ok() call in init" 2020-03-01 15:14:39 +00:00
Automerger Merge Worker 61f7ce1a42 [automerger skipped] Merge "Mark updatable APEXes" am: ab8a7e35ec am: ea7af90e3e -s ours 
am skip reason: Change-Id Ic3edc7e285e9eafbdaa20b18ccbc0b2231370779 with SHA-1 7c2ae1f02c is in history

Change-Id: I360a61112c2fbc0244fffa8ee5ed82708c4526a9
 2020-03-01 01:07:08 +00:00
Automerger Merge Worker ea7af90e3e Merge "Mark updatable APEXes" am: ab8a7e35ec 
Change-Id: Iaa4dba96e1ad565094c054d6d35b2e6b845d3c09
 2020-03-01 00:41:22 +00:00
Jiyong Park ab8a7e35ec Merge "Mark updatable APEXes" 2020-03-01 00:39:18 +00:00
Automerger Merge Worker bd46f2ec1c Merge changes from topic "userspace-reboot-bootstrap-namespace" am: 3efe4c37ea am: def80b3e9d 
Change-Id: I0b4d880bad52e4b10dd154095be9a76df4039015
 2020-02-29 13:25:42 +00:00
Nikita Ioffe 284d0cf746 Reset post_data_ and services_update_finished_ on userspace reboot 
Test: adb reboot userspace
Bug: 143970043
Change-Id: I77d47a8460b1526337a318547a59141334e11cdd
Merged-In: I77d47a8460b1526337a318547a59141334e11cdd
(cherry picked from commit 3ad292025c)
 2020-02-29 13:18:39 +00:00