Commit Graph

68236 Commits

Author SHA1 Message Date
Marco Ballesio
db1d83541f Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: c2ca422b48 am: 5ef3434bca am: 2d9f6f3687
Change-Id: I6ba34c12c2f7a701f5091eb180e64065e982ba5a
2020-05-06 17:30:48 +00:00
Marco Ballesio
6247ede453 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: e4b0a92474 am: 0e98dfb6d3 am: 3121cebe76
Change-Id: I6c38b7db2be0eeda0d3b5fc8f557690825228d20
2020-05-06 17:27:55 +00:00
Marco Ballesio
2d9f6f3687 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: c2ca422b48 am: 5ef3434bca
Change-Id: I2b44a1553f5203a76bbb14acb9b32ecc5de8c522
2020-05-06 17:25:21 +00:00
Marco Ballesio
3121cebe76 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: e4b0a92474 am: 0e98dfb6d3
Change-Id: I58e4e1a8582042c500ae818ff1a4320e219d2e2e
2020-05-06 17:23:32 +00:00
Bill Yi
713492f494 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c am: 4192f7f836 -s ours am: 1dce470772 am: d440c0c553 am: f7bd144d10 -s ours
am skip reason: subject contains skip directive

Change-Id: Iafa7954923d44f0872633dabf95bc72b8cb778f9
2020-05-06 17:22:28 +00:00
Bill Yi
3510982137 [automerger skipped] Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851 am: 3194770f30 -s ours am: 915072e417 am: d2410ff96f am: acb826b3aa -s ours
am skip reason: subject contains skip directive

Change-Id: Id789e0ccef6cec3b0de70e85fcb851dc91805c0c
2020-05-06 17:22:19 +00:00
Marco Ballesio
5ef3434bca Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: c2ca422b48
Change-Id: I9a5e32dd31d2c6d8725172604780adcf3d300d3d
2020-05-06 17:07:40 +00:00
Marco Ballesio
0e98dfb6d3 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a am: e4b0a92474
Change-Id: I412df7cad4269ab10ab97923af5685141b75ac19
2020-05-06 17:01:57 +00:00
Bill Yi
f7bd144d10 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c am: 4192f7f836 -s ours am: 1dce470772 am: d440c0c553
Change-Id: I4e40aaa18be15bddb83691824367c414c1ac7060
2020-05-06 16:54:28 +00:00
Bill Yi
acb826b3aa [automerger skipped] Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851 am: 3194770f30 -s ours am: 915072e417 am: d2410ff96f
Change-Id: I162673cc64e1bb2ae514c89d43f8b1931b933811
2020-05-06 16:54:23 +00:00
Marco Ballesio
e4b0a92474 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
Change-Id: I97ad96ca8a9c2245dd1f8597a440985be5c19731
2020-05-06 16:50:24 +00:00
Marco Ballesio
c2ca422b48 Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
Change-Id: I3c892f89d8e10fc7c9d4532347b6bc95985467bd
2020-05-06 16:49:02 +00:00
Bill Yi
d440c0c553 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c am: 4192f7f836 -s ours am: 1dce470772
Change-Id: I50e278a13651722840e855574cd02ce04bb4b177
2020-05-06 16:39:26 +00:00
Bill Yi
d2410ff96f [automerger skipped] Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851 am: 3194770f30 -s ours am: 915072e417
Change-Id: Ib7100b91718262f57dde32c31680fb114d8f9434
2020-05-06 16:39:22 +00:00
Marco Ballesio
97483a978a Merge "Developer option for the app freezer" into rvc-dev 2020-05-06 16:35:45 +00:00
Bill Yi
1dce470772 [automerger skipped] Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c am: 4192f7f836 -s ours
am skip reason: subject contains skip directive

Change-Id: I32c0fb7c49f0be204d41c590b6d504816ef97a26
2020-05-06 16:24:52 +00:00
Bill Yi
915072e417 [automerger skipped] Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851 am: 3194770f30 -s ours
am skip reason: subject contains skip directive

Change-Id: I33712962d0840487d934d7a6153cc5e77046744e
2020-05-06 16:24:46 +00:00
Bill Yi
4192f7f836 Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c
Change-Id: I309b9093a6f18bbb88f2a1b6ae3c7dc71c17cc13
2020-05-06 16:15:39 +00:00
Bill Yi
3194770f30 Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851
Change-Id: Ia5775138e7e2a368a721cb648050014898312d9a
2020-05-06 16:15:34 +00:00
Bill Yi
a502c55a5c Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" 2020-05-06 15:59:08 +00:00
Tim Peng
6fff208da0 PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea am: 679ac79a5c am: 2871a070e6
Change-Id: Id221b88734ac3c7d3c62c7b2c38f598ebd26b21d
2020-05-06 14:25:34 +00:00
Tim Peng
cea53adc46 PanelSlicesAdapterTest failure am: 901e1503f5 am: 77e13b3566 am: 1078aa22c0 am: 94afbec2a3
Change-Id: I40d0a74ef252d70ff9fe65830c0de00bb5726aee
2020-05-06 14:25:25 +00:00
Tim Peng
6598fc8c70 PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea am: 2b12b0ada7 am: e22e390a97
Change-Id: I69a5d18e6cf72505ca3ce12dffe0758172156ab4
2020-05-06 14:25:11 +00:00
Tim Peng
2871a070e6 PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea am: 679ac79a5c
Change-Id: I830b57248e83a0153a3eceb90cf8c9e7ad495998
2020-05-06 14:09:31 +00:00
Tim Peng
94afbec2a3 PanelSlicesAdapterTest failure am: 901e1503f5 am: 77e13b3566 am: 1078aa22c0
Change-Id: I3c423cef432719792f4465c29e50151c7acd68dc
2020-05-06 14:09:18 +00:00
Tim Peng
e22e390a97 PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea am: 2b12b0ada7
Change-Id: I2bb0d3373b19749cd4d591bdb776c78d58cb1f82
2020-05-06 14:09:05 +00:00
Tim Peng
1078aa22c0 PanelSlicesAdapterTest failure am: 901e1503f5 am: 77e13b3566
Change-Id: I087e9e9680228cbf2f8cd678fa59d0c67654bae9
2020-05-06 13:57:21 +00:00
Tim Peng
679ac79a5c PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea
Change-Id: I42f6b03ce96d042adfec9a946a4251727381e29c
2020-05-06 13:57:21 +00:00
Tim Peng
2b12b0ada7 PanelSlicesAdapterTest failure am: 901e1503f5 am: 65986f7eea
Change-Id: I56e6d6832a14567d0eaea2c95e906ea800295723
2020-05-06 13:57:01 +00:00
Tim Peng
77e13b3566 PanelSlicesAdapterTest failure am: 901e1503f5
Change-Id: Ib6f2e752b1e44513b0ecc7accdb5f2d456aa7e4c
2020-05-06 13:42:17 +00:00
Tim Peng
65986f7eea PanelSlicesAdapterTest failure am: 901e1503f5
Change-Id: Iefc97416859e8099699a19aaf4bbdcc08c085873
2020-05-06 13:42:08 +00:00
TreeHugger Robot
61e0b07b9c Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: cc5eca47da am: 0827a87ebf am: aeacb3f339
Change-Id: Ia79f96ff1204bea537b9ea991b8b3b31af8d5c95
2020-05-06 11:55:26 +00:00
Yi-Ling Chuang
38296422e2 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 0b4c9de231 am: 672b64506a am: 1e4c2882e4
Change-Id: I9239b5728180d1b721d28d831fc310563ec4a20b
2020-05-06 11:55:17 +00:00
TreeHugger Robot
099bedf92a Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04 am: da7f016264 am: 4a31fc491e
Change-Id: Ia64ff61a8404e659d2eb573f53a56ee2f9724b06
2020-05-06 11:55:08 +00:00
Yi-Ling Chuang
9ac3440cf6 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4 am: 42956c3259 am: 4e80e71b73
Change-Id: Idf4854d8a844e278c8e3f9c8be4c721fb580d10f
2020-05-06 11:55:01 +00:00
TreeHugger Robot
8ca7a534e4 Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04 am: bd4ce318bc am: c27bb24fcf
Change-Id: I22820f66b6620fd29ee6ba76827b0eb87f905017
2020-05-06 11:54:54 +00:00
Yi-Ling Chuang
d5fd1dd2e3 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4 am: 4c1d3f20a3 am: 78f8150a5c
Change-Id: I401a2eb477ffb64695386e764876819e4ebaa3cb
2020-05-06 11:54:41 +00:00
TreeHugger Robot
aeacb3f339 Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: cc5eca47da am: 0827a87ebf
Change-Id: I464fbd933c55e8dbc8b2288d541d2a0dad0a8253
2020-05-06 11:40:59 +00:00
Yi-Ling Chuang
1e4c2882e4 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 0b4c9de231 am: 672b64506a
Change-Id: I28802cd895cb6cee04a10c90a31dd79d593b4626
2020-05-06 11:40:52 +00:00
TreeHugger Robot
4a31fc491e Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04 am: da7f016264
Change-Id: Id3a7d6562b8bc888610223e46cf78c023225f567
2020-05-06 11:40:43 +00:00
Yi-Ling Chuang
4e80e71b73 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4 am: 42956c3259
Change-Id: Idd1cd4aa914751f497989d0b7e0a69e758162125
2020-05-06 11:40:33 +00:00
TreeHugger Robot
c27bb24fcf Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04 am: bd4ce318bc
Change-Id: Id0c63405d0d8a03f67b7638b82269d0af0f5cb6b
2020-05-06 11:39:32 +00:00
Yi-Ling Chuang
78f8150a5c Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4 am: 4c1d3f20a3
Change-Id: If3ba1f6aa6da956e65bd8b12bbcd282aa2b5063d
2020-05-06 11:39:23 +00:00
Tim Peng
901e1503f5 PanelSlicesAdapterTest failure
-Update test cases

Bug: 11390111
Test: make -j50 RunSettingsRoboTests
Change-Id: I6efd6b619eb5bc20b654a73bf1963ea9f446516d
2020-05-06 11:32:57 +00:00
TreeHugger Robot
0827a87ebf Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: cc5eca47da
Change-Id: Ia611b029aef6274f1991f65803c2f248d2f0d528
2020-05-06 11:20:47 +00:00
Yi-Ling Chuang
672b64506a Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 0b4c9de231
Change-Id: I24eeb86e9279b0a05059efa462e9b869900823d0
2020-05-06 11:20:40 +00:00
TreeHugger Robot
bd4ce318bc Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04
Change-Id: I21fa2c4c84fa9024f9a76378d3d974647d16b249
2020-05-06 11:20:15 +00:00
Yi-Ling Chuang
4c1d3f20a3 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4
Change-Id: I317af8067149588cb98d89fe709de5329d283b05
2020-05-06 11:20:09 +00:00
TreeHugger Robot
da7f016264 Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04
Change-Id: I05fe58a66b635287a5201d467ac39126b43208f9
2020-05-06 11:20:08 +00:00
Yi-Ling Chuang
42956c3259 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4
Change-Id: I1a0b4b16fd2ec92b210973b6338434226cbf39e2
2020-05-06 11:19:56 +00:00