aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterq_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-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-releaseXin Li
am: 652ca8938a -s ours am skip reason: subject contains skip directive Change-Id: I14d01d3ce51da142180a96718af07ad870037d06
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ie360a56b58e71335ef1acc28af11f7fae081e7a7
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours am: 70392a8547 -s ours Change-Id: I687d8f26a39961de73400089140aaa9a2acdfdd8
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours Change-Id: I8bd0ea3bbd06359438e64e89ffcbc0615032d962
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9eaf8f485b -s ours Change-Id: I4e39afb1df962b680893fee8b1d47fc0fe3ef588
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-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-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi
Change-Id: Ibb6a0c3e4b887ebce0f6bbfea956fa63f23fc2b1
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: bc9b060c28 -s ours am: 56ddfbd7c6 -s ours Change-Id: I33f0161bc965e613ad062463338ba6ddc8f29e5b
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: bc9b060c28 -s ours Change-Id: I604ad890b7bc07180aecb358bd0496276c2d5696
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ie95fdd6c3a8e9fc953487338567c9b528d1155cf
2018-09-26smbprovider: Add MountConfigProto to directory_entry am: f63dc2e08f am: ↵Jimmy Gong
4f5e3f29fa am: 3b11623c09 am: 03282d7474 Change-Id: I8033ffe21b246a82c5581e64d8c5143fa7f3b4ec
2018-09-26system_api: add anomaly event service interface am: 98bc2a6d4b am: ↵Luigi Semenzato
ec99d67c3f am: 413ad9e7de am: f268c039bd Change-Id: Ie74a1484021f8b9ab327b8856dac4427d1be97a6
2018-09-26smbprovider: Add MountConfigProto to directory_entry am: f63dc2e08f am: ↵Jimmy Gong
4f5e3f29fa am: 3b11623c09 Change-Id: Ia2fd4adf765b6e5864029f216b6adcbba6d01f20
2018-09-26system_api: add anomaly event service interface am: 98bc2a6d4b am: ec99d67c3fLuigi Semenzato
am: 413ad9e7de Change-Id: I712dd6e37273a22631252d821172bc542c83797b
2018-09-26smbprovider: Add MountConfigProto to directory_entry am: f63dc2e08fJimmy Gong
am: 4f5e3f29fa Change-Id: I488f309d7ca759ba32342e05388a812a099d466f
2018-09-26system_api: add anomaly event service interface am: 98bc2a6d4bLuigi Semenzato
am: ec99d67c3f Change-Id: I2c99519b7601c66b52407ac2e67bf8d57856ed78
2018-09-26smbprovider: Add MountConfigProto to directory_entryandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseJimmy Gong
am: f63dc2e08f Change-Id: Ic468d1f954009321e594d96f6f8c70ccaf87333d
2018-09-26system_api: add anomaly event service interfaceLuigi Semenzato
am: 98bc2a6d4b Change-Id: I068e11ac44524bd35898dda5142e0bf098ae6722
2018-09-26smbprovider: Add MountConfigProto to directory_entryupstream-masterJimmy Gong
- Added MountConfigProto since MountConfig options will be passed from chrome-side. BUG=chromium:888096 TEST=emerges Change-Id: Ia5514b53b4070738aeb9ff1b55f212d9b90071ec Reviewed-on: https://chromium-review.googlesource.com/1239199 Commit-Ready: jimmy gong <jimmyxgong@chromium.org> Tested-by: jimmy gong <jimmyxgong@chromium.org> Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
2018-09-26system_api: add anomaly event service interfaceLuigi Semenzato
This also adds new event types to the metrics event protobuf, and adds generation of C++ sources for use by the anomaly collector. BUG=chromium:729335 TEST=compiles, links, and runs with anomaly_collector Change-Id: I330d9103752c9db58c6db824f69e25d5cc6bd180 Reviewed-on: https://chromium-review.googlesource.com/1239736 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
2018-09-25system_api: Add power_manager::kSetScreenBrightnessMethod. am: 536735c009 ↵Daniel Erat
am: 89d84940b4 am: 40e7b51446 am: 1c011209f3 Change-Id: I89248580b384ebb120698229fe3cb949139df5bd
2018-09-25system_api: Add power_manager::kSetScreenBrightnessMethod. am: 536735c009 ↵Daniel Erat
am: 89d84940b4 am: 40e7b51446 Change-Id: I440c541307c998f8e811149d224e305518c3a39d
2018-09-25system_api: Add power_manager::kSetScreenBrightnessMethod. am: 536735c009Daniel Erat
am: 89d84940b4 Change-Id: I75d56421e8b62651de1a528bb269710aea166015
2018-09-25system_api: Add power_manager::kSetScreenBrightnessMethod.Daniel Erat
am: 536735c009 Change-Id: I1501b603aaf6c6596e16a51dba351edb55d474f8
2018-09-25system_api: Add power_manager::kSetScreenBrightnessMethod.Daniel Erat
Add a new "SetScreenBrightness" constant. The existing powerd SetScreenBrightnessPercent is being updated to take a protocol message instead of D-Bus args, so we might as well rename it to be shorter at the same time. BUG=chromium:881786 TEST=used with updated powerd Change-Id: I720b259fe518e0a9a45f981a0ba1db68d9a726b4 Reviewed-on: https://chromium-review.googlesource.com/1242034 Commit-Ready: Dan Erat <derat@chromium.org> Tested-by: Dan Erat <derat@chromium.org> Reviewed-by: Jia Meng <jiameng@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
2018-09-21system_api: Add SetBacklightBrightnessRequest powerd proto. am: 9aded9e58d ↵Daniel Erat
am: 1ab16e3964 am: 4ddc854ba3 am: dc44d954be Change-Id: Icf1825c5de23eddbb189bcc47aed41152a1be135
2018-09-21system_api: Add SetBacklightBrightnessRequest powerd proto. am: 9aded9e58d ↵Daniel Erat
am: 1ab16e3964 am: 4ddc854ba3 Change-Id: Ie5af47683696bc13effdfd111b18664d9dc9eff6
2018-09-21system_api: Add SetBacklightBrightnessRequest powerd proto. am: 9aded9e58dDaniel Erat
am: 1ab16e3964 Change-Id: I8b05ccf37245bc01e4b64cc9749f9e70be737060
2018-09-21system_api: Add SetBacklightBrightnessRequest powerd proto.Daniel Erat
am: 9aded9e58d Change-Id: Ia2748af4881724a915068aecb81bbe5043936998
2018-09-21system_api: change message name. am: ebc49ea2d3 am: 6093b7f8f0 am: 3f124f3e78Xiaoyong Zhou
am: 8182949c24 Change-Id: I8bd68ba65be4ea5475e569e17ee816cae04106fe
2018-09-21system_api: Add SetBacklightBrightnessRequest powerd proto.Daniel Erat
Add a SetBacklightBrightnessRequest protocol message that Chrome will send to powerd via SetScreenBrightnessPercent D-Bus method calls. These calls currently send raw D-Bus arguments, but a new "cause" argument is needed. Also add a new "MODEL" enum value to BacklightBrightnessChange's "cause" enum. BUG=chromium:881786 TEST=built it Change-Id: Ife2fc6741ece56620ced37feab8e33c093aeae0a Reviewed-on: https://chromium-review.googlesource.com/1237429 Commit-Ready: Dan Erat <derat@chromium.org> Tested-by: Dan Erat <derat@chromium.org> Reviewed-by: Jia Meng <jiameng@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
2018-09-21diagnostics: Constant for Mojo pipe token am: 891a69dbf8 am: cfa9ff1d69 am: ↵Maksim Ivanov
fabb8c75c1 am: 31d09a710f Change-Id: I03132b2c12fd65c1815272215a950ef9fec17bc2
2018-09-21system_api: change message name. am: ebc49ea2d3 am: 6093b7f8f0Xiaoyong Zhou
am: 3f124f3e78 Change-Id: I1a08b448910036969301b5b75978d69072c84380
2018-09-21diagnostics: Constant for Mojo pipe token am: 891a69dbf8 am: cfa9ff1d69Maksim Ivanov
am: fabb8c75c1 Change-Id: I0143b70f8994c20f41a902650336a09b081cd2b4
2018-09-20system_api: change message name. am: ebc49ea2d3Xiaoyong Zhou
am: 6093b7f8f0 Change-Id: I9badff0e8f266e98c65c4ef2041ae74afe958aef
2018-09-20diagnostics: Constant for Mojo pipe token am: 891a69dbf8Maksim Ivanov
am: cfa9ff1d69 Change-Id: Ic6a0a665c2b9ac56af9a8e0a75cb0ee5305d8c47
2018-09-20system_api: change message name.Xiaoyong Zhou
am: ebc49ea2d3 Change-Id: Iec8a045a11c8ffd70ad62a05f1c92bbbfb09bdfc
2018-09-20diagnostics: Constant for Mojo pipe tokenMaksim Ivanov
am: 891a69dbf8 Change-Id: Iec60201c55adb59306939aade5f1ee54862de39b
2018-09-20system_api: change message name.Xiaoyong Zhou
This CL change the name of LockBootLockboxRequest to FinalizeNVRamBootLockboxRequest for consistent naming. BUG=None TEST=None Change-Id: I1e72e29c3271fd1ebd394f79956555c9d5e396ba Reviewed-on: https://chromium-review.googlesource.com/1225890 Commit-Ready: Xiaoyong Zhou <xzhou@chromium.org> Tested-by: Xiaoyong Zhou <xzhou@chromium.org> Reviewed-by: Mattias Nissler <mnissler@chromium.org>
2018-09-20diagnostics: Constant for Mojo pipe tokenMaksim Ivanov
Add a constant with the Mojo pipe token for the Mojo pipe between the browser and the diagnosticsd daemon. This constant needs to be known on both ends of this Mojo pipe. For example, on the browser side, that's the name that is passed to mojo::OutgoingInvitation::AttachMessagePipe(). BUG=chromium:869377 TEST=system_api package builds Change-Id: I3020c07de5493dac0740e43a4ec2d1791105e805 Reviewed-on: https://chromium-review.googlesource.com/1230873 Commit-Ready: Maksim Ivanov <emaxx@chromium.org> Tested-by: Maksim Ivanov <emaxx@chromium.org> Reviewed-by: Roman Sorokin <rsorokin@chromium.org>
2018-09-19Add VmStatus to StartVmResponse. am: 137cb973fb am: 45cd86d54d am: e7065cdce9Nicholas Verne
am: 13625c7825 Change-Id: I6167a85d72b13f0325440a25b715c03f3ba7400d
2018-09-19Add VmStatus to StartVmResponse. am: 137cb973fb am: 45cd86d54dNicholas Verne
am: e7065cdce9 Change-Id: Ia87112bc5a9664df7a8e3a5084214010d3bc06ea
2018-09-19Add VmStatus to StartVmResponse. am: 137cb973fbNicholas Verne
am: 45cd86d54d Change-Id: I0560490881cb8c6e8c8034b42496c53226d3b475
2018-09-19Add VmStatus to StartVmResponse.Nicholas Verne
am: 137cb973fb Change-Id: Iab2f35e320fa323758b76654bdac6d0a837990ca
2018-09-19Add VmStatus to StartVmResponse.Nicholas Verne
When this status indicates the VM is already running, CrostiniManager can avoid waiting forever for a signal that Tremplin has started in the VM. Bug: crbug:884576 Change-Id: I7c4577a4fa5d0bcba2c158a046ad31e81236b421 Reviewed-on: https://chromium-review.googlesource.com/1226733 Commit-Ready: Nicholas Verne <nverne@chromium.org> Tested-by: Nicholas Verne <nverne@chromium.org> Reviewed-by: Jeffrey Kardatzke <jkardatzke@google.com>
2018-09-18Add a display density parameter. am: 48093e2673 am: aaf6849906 am: 94c60b5103Tim Zheng
am: c7e70c320b Change-Id: Ibc3f6091cd88c9cbe9898d0e479f2c8dae93fb5f
2018-09-18Add package info for Crostini apps am: 9939aeafb5 am: 859f5a1a15 am: 26f534633eIan Barkley-Yeung
am: 23bd1594ba Change-Id: I47a7388b0a81c5a4422923bc7eb4d7750be31dda
2018-09-18Add a display density parameter. am: 48093e2673 am: aaf6849906Tim Zheng
am: 94c60b5103 Change-Id: I36142d10902346f7094f6fd2abf673b01a4a5da1
2018-09-18Add package info for Crostini apps am: 9939aeafb5 am: 859f5a1a15Ian Barkley-Yeung
am: 26f534633e Change-Id: I7e84bddf1323dca4755210b8e4a1cb39f7c03c00
2018-09-18Add a display density parameter. am: 48093e2673Tim Zheng
am: aaf6849906 Change-Id: I51443c4656d0e0df4f4455541aa32eee25f3aaf8
2018-09-18Add package info for Crostini apps am: 9939aeafb5Ian Barkley-Yeung
am: 859f5a1a15 Change-Id: I159cd027f8f7ca6ba3b2c76d67545a1037e6b177