aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseBill Rassieur
am: b2834234e3 Change-Id: I5abb2ede9f92c8a028ef67fe956c921cf26c727c
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Ic3dbc268c2b2f9c860ea21c4308d704df8dba578 BUG: 129345239
2019-03-25Remove test runner rule am: 9715862d2c am: ed8287f098Colin Cross
am: 8dfd450857 Change-Id: I316ed6c3013127699c697bfeb074c8dafee80836
2019-03-25Remove test runner rule am: 9715862d2cColin Cross
am: ed8287f098 Change-Id: I7a157edda93715cefb8ab772004b8280b754964f
2019-03-25Remove test runner ruleandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Colin Cross
am: 9715862d2c Change-Id: I355325da814353cd9b7157c20a9f0cfc642c7daf
2019-03-22Remove test runner ruleandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseColin Cross
atest libbrillo_test is the supported method to run the tests. Fixes: 122332057 Test: none Change-Id: I3f8fa89773abb4f07badf61e363090bc224879df
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 0768e6b58e -s ours am skip reason: subject contains skip directive Change-Id: Iec5d34bb32d8e34389c77c474e8cfb2faa20b721
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I616bdffdfb0bfdc72f8a92cd598cd097acdac98a
2019-01-08Process: allow closed target fd. am: 1193286ebe am: e6218de3c6Sen Jiang
am: ad083ea5b7 Change-Id: Id1fbfe6f69c08017d5c6f959ccd337a25ef8fe65
2019-01-08Process: allow closed target fd. am: 1193286ebeSen Jiang
am: e6218de3c6 Change-Id: Ibdf909e9a32b844a6169775ffcd1b5c9463c1fa4
2019-01-08Process: allow closed target fd.Sen Jiang
am: 1193286ebe Change-Id: I95e7b2d991e6d0d149ea635fb004f8378082acda
2018-12-21Process: allow closed target fd.android-q-preview-1android-o-mr1-iot-release-1.0.10Sen Jiang
The comment suggest that the fstat() check is to simplify the logic to dup2, this patch switch to use base::ShuffleFileDescriptors() to handle that logic so that we can allow closed fd. Bug: 121177337 Test: unit tests Change-Id: I9fdb0cd00fb371ebcd90a3d6e91a353159ab8413
2018-11-01Mark libbrillo as recovery_available for update_engine_sideload am: ↵Dan Willemsen
f6035ae5e8 am: 2b2d62f76e am: c37cea20c7 Change-Id: I5cb3a693c05501d977b4545736c2f3b98de500b2
2018-11-01Mark libbrillo as recovery_available for update_engine_sideload am: f6035ae5e8Dan Willemsen
am: 2b2d62f76e Change-Id: I5aa03bdb1dee91ce9d36ddba2e9a44fa7b2c474d
2018-11-01Mark libbrillo as recovery_available for update_engine_sideloadDan Willemsen
am: f6035ae5e8 Change-Id: Iaeedd13f36d404ff7d92df6ce17a290d5b144717
2018-11-02Mark libbrillo as recovery_available for update_engine_sideloadandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseDan Willemsen
Test: build update_engine_sideload Change-Id: I317df5338fe7e8377a9f5d416cc09a99e8d79bc1
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: d7ce703857 -s ours am: b7629499f0 -s ours am: fff58d4773 -s ours Change-Id: Ib947e04fc2b8fd11b9fd0e177465b6eb52d9f3a0
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: d7ce703857 -s ours am: b7629499f0 -s ours Change-Id: Ie742d52932ded4aa1bbdd6ca4086ca9046b44733
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: d7ce703857 -s ours Change-Id: Id2d24e21e66652fa6b5470667e3a9f22b1a23e94
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: I82f93ac199999e8dc1f6998d8c5ae47761d0e47c
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 8ee02968b0 -s ours am: 558a43f008 -s ours Change-Id: I04843faa35b853a16abb651ad8317b844ac35f87
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 8ee02968b0 -s ours Change-Id: I2ef7e3ff24f1e2caa55750510a467cb96fe86f51
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I5325b514dc1f9069c1f781cb1443edbbe1fd174c
2018-10-15[automerger skipped] Uprev libchrome to r576279 (1/many) am: cfd1fbb90d am: ↵Jakub Pawlowski
3a75a52d4e am: 6fab0bf28a -s ours Change-Id: I9a64291969c69150a1f2aa8ba48b826b61b0c83e
2018-10-15Uprev libchrome to r576279 (1/many) am: cfd1fbb90dJakub Pawlowski
am: 3a75a52d4e Change-Id: I7ecc3d2dacd159c45ef9835cad2f9c64a064c072
2018-10-15Uprev libchrome to r576279 (1/many)Jakub Pawlowski
am: cfd1fbb90d Change-Id: I3a01f1c3c627ea6fd1358e839c4f92ca9f1bbc55
2018-10-13Uprev libchrome to r576279 (1/many)Jakub Pawlowski
Test: compilation Change-Id: If75092008dcca5dfbb1683072f03cb1e5fa2e62f Merged-In: If75092008dcca5dfbb1683072f03cb1e5fa2e62f
2018-10-12Uprev libchrome to r576279 (1/many)Jakub Pawlowski
Test: compilation Change-Id: If75092008dcca5dfbb1683072f03cb1e5fa2e62f Merged-In: If75092008dcca5dfbb1683072f03cb1e5fa2e62f (cherry picked from commit ef0f9cdcaab17cb18c75fc04810ceb553752d4c9)
2018-10-01Move to new isolation test runner. am: a53a186822 am: 5eacad6165Christopher Ferris
am: 2af48bbad1 Change-Id: I332a0063a80692b677c79554a148616d48bbd658
2018-10-01Move to new isolation test runner. am: a53a186822Christopher Ferris
am: 5eacad6165 Change-Id: Ia3dcea11e53dfdc12a76ef90b6b31d78b8561025
2018-10-01Move to new isolation test runner.Christopher Ferris
am: a53a186822 Change-Id: I608703bb6572afc18d5a29562e23cdf1f4dd2120
2018-09-11Move to new isolation test runner.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseChristopher Ferris
Test: Ran tests. Change-Id: Ia325d252caa1529abc51715855f7a5f81ea04f10
2018-08-14Merge remote-tracking branch 'aosp/upstream-master' into aosp/master. am: ↵Sen Jiang
0fa01c38cc am: 02903ef05e am: 012ffab435 Change-Id: Ia4f7c4b5efd6f001e69c10317334797793702856
2018-08-14Merge remote-tracking branch 'aosp/upstream-master' into aosp/master. am: ↵Sen Jiang
0fa01c38cc am: 02903ef05e Change-Id: I19f3bf81b582b791fc7f8cd05b86d3faf1752be1
2018-08-14Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.Sen Jiang
am: 0fa01c38cc Change-Id: Ifc725167753e0e2c9d5a7f966c70fa22329166e3
2018-08-10Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.android-o-mr1-iot-release-1.0.4Sen Jiang
Merge Chromium ToT to AOSP: git fetch aosp upstream-master git merge -X patience aosp/upstream-master Bug: 112326236 Test: libbrillo_test Change-Id: I35fbbddad556b051ce12b9cdd95bb2afef3cf6af
2018-08-03libbrillo: policy: Modify UpdateStaging policy due to change in designAdolfo Victoria
Modify the DeviceUpdateStagingSchedule policy code to account for the changes to use JSON strings. Add JSONToListValue to remove repeated logic between new JSON based policies. BUG=chromium:858621 TEST=cros_workon_make libbrillo --test CQ-DEPEND=CL:1158225 Change-Id: I01f73980c5309d77bfe04861255d6665cb7e2e11 Reviewed-on: https://chromium-review.googlesource.com/1142480 Commit-Ready: Lutz Justen <ljusten@chromium.org> Tested-by: Lutz Justen <ljusten@chromium.org> Tested-by: Adolfo Higueros <adokar@google.com> Reviewed-by: Dan Erat <derat@chromium.org>
2018-08-01move manifest* from imageloader to libbrilloXiaochu Liu
We move them to libbrillo so it could be shared by imageloader&dlcservice. BUG=chromium:866203 TEST=unittest Change-Id: Id6e1f898d69c5cb1d4d291147482248ee3578f03 Reviewed-on: https://chromium-review.googlesource.com/1147249 Commit-Ready: Xiaochu Liu <xiaochu@chromium.org> Tested-by: Xiaochu Liu <xiaochu@chromium.org> Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>
2018-07-20libbrillo: Add new policy (DeviceUpdateStagingSchedule) for staging updates.May Lippert
Add a new device policy that will allow administrators to specify a schedule for rolling out updates to an organizational unit. BUG=chromium:858621 TEST=Used YAPS as DM server, verified that the new policy is parsed correctly. CQ-DEPEND=CL:1119162 Change-Id: I72852ddf86e6c7e432aea38a33c6fb3be4c7f315 Reviewed-on: https://chromium-review.googlesource.com/1123683 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: May Lippert <maybelle@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
2018-07-18libbrillo: policy: Add new update time restrictions policyAdolfo Victoria
Add a new device policy from chrome_device_policy.proto: DeviceAutoUpdateTimeRestrictions BUG=chromium:852860 TEST=libpolicy unit tests CQ-DEPEND=CL:1136538 Change-Id: Iaef8791f683af00668dcd4041282758cc26b8fbf Reviewed-on: https://chromium-review.googlesource.com/1101707 Commit-Ready: Adolfo Higueros <adokar@google.com> Tested-by: Adolfo Higueros <adokar@google.com> Reviewed-by: Dan Erat <derat@chromium.org>
2018-06-28Add SecureBlob::HexStringToSecureBlob.Jorge Lucangeli Obes
Polymorphic usage of SecureBlob is problematic (see crbug.com/728047). In some cases we're unnecessarily passing plain Blobs into functions that take SecureBlobs because we don't have code to create a SecureBlob from a hex string, so we use base::HexStringToBytes to create a Blob instead. This CL does attempt to use HexStringToBytes and then zero out the memory. As long as we still have polymorphic usage of SecureBlobs, this is not a big deal. Once we decouple SecureBlob from Blob, we can improve this implementation. BUG=chromium:728047 TEST=New unit tests. Change-Id: Iad94cbd8f574dd35730cb2d68b6ae39798b03ef6 Reviewed-on: https://chromium-review.googlesource.com/1114919 Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org> Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
2018-06-21SecureBlob: Improve unit tests.Jorge Lucangeli Obes
When SecureBlob stops inheriting from Blob we'll want to make sure that functionality continues to work. BUG=chromium:728047 TEST=New unit tests pass. Change-Id: I23bbbc37287046ad48ad3b234d752fba934d8d9e Reviewed-on: https://chromium-review.googlesource.com/1110150 Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org> Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
2018-06-19Mark runtargettests as a phony rule am: 43294d93af am: b5f20f52abDan Willemsen
am: 5d78951d5b Change-Id: I85d0af13bb9473a8c15b415c662f68b49b7e70b6
2018-06-19Mark runtargettests as a phony rule am: 43294d93afDan Willemsen
am: b5f20f52ab Change-Id: If4c83ded270bf1ccde7affe28281ba45ed22aa3f
2018-06-19Mark runtargettests as a phony ruleandroid-o-mr1-iot-release-1.0.3Dan Willemsen
am: 43294d93af Change-Id: I90329279831548caf429fd10b2f29346c49bd2f8
2018-06-18Mark runtargettests as a phony ruleandroid-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayDan Willemsen
It doesn't produce an output file, so this should be marked as phony. Test: Fewer warnings when --warn_real_to_phony is enabled for kati Change-Id: I2c1733603923146ea0981d76f592c281fcbffda1
2018-06-07libbrillo: Blob combining utilityMaksim Ivanov
Add a function that concatenates given Blob's. This provides analogous functionality of SecureBlob::Combine() to Blob. BUG=chromium:728047 TEST=new unit test (BlobTest.CombineBlobs) Change-Id: I33218bd81a49a265d021e7afdcf438b7fc70921d Reviewed-on: https://chromium-review.googlesource.com/1089338 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
2018-06-05libbrillo: Blob to/from std::string conversionsMaksim Ivanov
Add routines that allow dumping Blob contents into an std::string, and, vice versa, constructing Blob from such a string. These helpers should simplify writing code that works with Blob's, and consequently help transitioning away from SecureBlob (as the latter provides the same capabilities). BUG=chromium:728047 TEST=new unit test (BlobTest.StringConversions) Change-Id: I18223a99899216fe07cbf948bef86dce86777f69 Reviewed-on: https://chromium-review.googlesource.com/1076629 Commit-Ready: Maksim Ivanov <emaxx@chromium.org> Tested-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
2018-06-05dbus: Fix Properties.Set handler to also emit PropertiesChangedSonny Sasaka
When a D-Bus property value is changed, it should emit PropertiesChanged signal. BUG=chromium:840517 TEST=None Change-Id: I414a62b04f4fb1383152375e1efae434c114e2be Reviewed-on: https://chromium-review.googlesource.com/1049169 Commit-Ready: Sonny Sasaka <sonnysasaka@chromium.org> Tested-by: Sonny Sasaka <sonnysasaka@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org>
2018-05-31libbrillo: Set RollbackAllowedMilestones enterprise default to 0Marton Hunyady
Changing the default value of RollbackAllowedMilestones policy from 4 to 0 for enterprises (already 0 for consumer devices). Until the kernel and firmware key versions can be set properly from Omaha, we don't freeze key rolls by default, only if it's explicitly specified using enterprise policy. BUG=chromium:847226 TEST='cros_run_unit_tests --board=caroline --packages libbrillo' Change-Id: I4451a4e31f475a8b7557fea4f44dc35afe95ef0b Reviewed-on: https://chromium-review.googlesource.com/1078811 Commit-Ready: Marton Hunyady <hunyadym@chromium.org> Tested-by: Marton Hunyady <hunyadym@chromium.org> Reviewed-by: Mattias Nissler <mnissler@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 14:17:47 +0000