Commit Graph

61192 Commits

Author SHA1 Message Date
Automerger Merge Worker
22d69f8588 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366 am: 158de66300
Change-Id: Icefb1762becf0d7815a491beeb2659e11b3e821f
2020-03-13 00:38:36 +00:00
Automerger Merge Worker
82b9a7aa65 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4 am: 2febd6e59f am: b24e351a84 -s ours
am skip reason: subject contains skip directive

Change-Id: I3ef7dc31d6e837402792ab036c6c730e36a32429
2020-03-13 00:37:56 +00:00
Automerger Merge Worker
88a427f9d7 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87 am: aa1a8dc3a5 am: bc062e6ead
Change-Id: Idb4542c82e33e196cf6c0ce25191ebaab11a89fa
2020-03-13 00:37:24 +00:00
Automerger Merge Worker
e0dd9eaf5c [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 135d77ae70 -s ours am: 56a95edb34 -s ours am: 49a1aebd2e -s ours
am skip reason: subject contains skip directive

Change-Id: I7f70c1be276a716e2cb7f345221177d7c3a8c4f0
2020-03-13 00:36:36 +00:00
Automerger Merge Worker
4c654b6e35 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 5d170c119a -s ours am: 443230b2bf -s ours am: 0595d63ad1 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fa980d74db5e99f744deb3e303129bb2f65dd53
2020-03-13 00:36:06 +00:00
Automerger Merge Worker
548ad0eede [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 74ae03d4a8 am: ca4f008287 am: 2bf6e60e2c -s ours
am skip reason: subject contains skip directive

Change-Id: Ia45acc1ef4945395c891672ac809f0dd6ba90592
2020-03-13 00:35:30 +00:00
Automerger Merge Worker
89160260e7 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: d37f5b5a7a am: 193d8cf727 am: da81d54de3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8ad5c6c4cca03cec08176d366b53f7a0f24d9932
2020-03-13 00:35:28 +00:00
Automerger Merge Worker
6c911aacd5 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 4302d438b0 -s ours am: b167885376 -s ours am: ee1accc141 -s ours
am skip reason: subject contains skip directive

Change-Id: I05585f1da36042e0a285af68843134fceb45141f
2020-03-13 00:34:30 +00:00
Automerger Merge Worker
387f5f8acc Merge "Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d" into rvc-d1-dev-plus-aosp am: d34664915a am: c3e996f204
Change-Id: I6b5ebbc2764d470f536612ea9e5cba5bdf85da3e
2020-03-12 23:39:49 +00:00
Automerger Merge Worker
8eb45c004d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: 841b980a88 am: a9027be3b0
Change-Id: I3db1900bc659a06796695ebc7f2c1a8460d06c94
2020-03-12 23:32:35 +00:00
Automerger Merge Worker
158de66300 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78 am: a379802366
Change-Id: Ic6a370374bf6e21c74dc12019316c9fb248f1b1c
2020-03-12 22:28:56 +00:00
Automerger Merge Worker
b24e351a84 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4 am: 2febd6e59f
Change-Id: Id0997a6e4a479dd8905cbe34c082c019a3b4bc15
2020-03-12 22:28:46 +00:00
Automerger Merge Worker
bc062e6ead Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87 am: aa1a8dc3a5
Change-Id: If1ac9026a90b7ae0ece820cfd620a29226ee6a9d
2020-03-12 22:27:51 +00:00
Automerger Merge Worker
49a1aebd2e [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 135d77ae70 -s ours am: 56a95edb34 -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577 is in history

Change-Id: I9520022aba9add2ad511ee72fdfce8565218d634
2020-03-12 22:27:28 +00:00
Automerger Merge Worker
0595d63ad1 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 5d170c119a -s ours am: 443230b2bf -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577 is in history

Change-Id: Ia6bde83305f2d9e2cb42c1c56daf09b3a5a700c2
2020-03-12 22:26:55 +00:00
Automerger Merge Worker
2bf6e60e2c [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 74ae03d4a8 am: ca4f008287
Change-Id: I57ac51cf6511a3f81d19eeb31d323982f42713d6
2020-03-12 22:26:14 +00:00
Automerger Merge Worker
da81d54de3 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: d37f5b5a7a am: 193d8cf727
Change-Id: Ic6139eaf6bd1ac7cbfd83cdccd620f6a6a0c3601
2020-03-12 22:26:12 +00:00
Automerger Merge Worker
ee1accc141 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 4302d438b0 -s ours am: b167885376 -s ours
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I2119c83ff213b8c0d5bc952a5d407b986938f769
2020-03-12 22:25:00 +00:00
Automerger Merge Worker
c3e996f204 Merge "Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d" into rvc-d1-dev-plus-aosp am: d34664915a
Change-Id: I42d2a2b83c114e5401528e90f8469207c1e82cfc
2020-03-12 20:32:21 +00:00
Automerger Merge Worker
a9027be3b0 Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: 841b980a88
Change-Id: I2dec0d85aeb44ac6b49e250d532d66ce68495050
2020-03-12 20:31:23 +00:00
Automerger Merge Worker
d34664915a Merge "Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d" into rvc-d1-dev-plus-aosp 2020-03-12 20:18:28 +00:00
Automerger Merge Worker
b4ea5b0865 Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: 58f8eded5d
Change-Id: I7f1941510bab18bd4f3a258525c1e535a909651a
2020-03-12 20:18:24 +00:00
Automerger Merge Worker
841b980a88 Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e
Change-Id: I7fd4175f3347153ff2c84bab2714228919a20e31
2020-03-12 20:18:18 +00:00
Automerger Merge Worker
4edbd60941 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2 am: 5b1ea14640 am: 046c46f073
Change-Id: I33ce05c027b3db9018cc5cebd540f22d1266efc3
2020-03-12 20:12:20 +00:00
Automerger Merge Worker
f34773fdad Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: 2c01f26e38 am: c299b60577
Change-Id: I5d679a49eef7049aff28a473eeedbc0a15892048
2020-03-12 20:09:22 +00:00
Automerger Merge Worker
69fdc6ff91 Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809 am: 311510b298 am: af76dea7d0 am: 5beca05a95 am: ecd0bf51c4
Change-Id: I3490773741dd9e05405652451e9c9c85c86735cb
2020-03-12 20:07:52 +00:00
Automerger Merge Worker
eda71b8c76 Merge "[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController" am: 0f15f98999 am: b9b0dd9bc5 am: a6829d80b2 am: d914509538 am: 74552f3ab1
Change-Id: Ib0a509c0f54eef4dc87c4b2b5b46a0c8f5fd0f85
2020-03-12 20:06:06 +00:00
Automerger Merge Worker
58f8eded5d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
Change-Id: I4316b557413cc003049cff812d3b09e6bc3aea4d
2020-03-12 20:03:04 +00:00
Automerger Merge Worker
ec6828f05e Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
Change-Id: I63b280ad795bb32210b0c45bc5f7bfb424f85919
2020-03-12 20:02:42 +00:00
Automerger Merge Worker
a4b5755d8a Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: 319842707c am: efdf695e5f
Change-Id: I7278d17db63faefc6d1372d74f2324f2d6aba124
2020-03-12 19:59:31 +00:00
Automerger Merge Worker
eee15b09e6 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 1032548a02 am: 5a1575a54d -s ours
am skip reason: subject contains skip directive

Change-Id: I4953923933e1a9e4584ce9778a377b14ef0cd610
2020-03-12 19:49:17 +00:00
Automerger Merge Worker
b269f2eb3a Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 624b3e089d am: 4c2c0c442c
Change-Id: I519c3c5c54f7a0afca3b5093d28cfc43c860655b
2020-03-12 19:48:13 +00:00
Zhen Zhang
0ad0a50538 Merge "Log some actions for changing wifi hotspot config" into rvc-dev 2020-03-12 19:47:42 +00:00
Automerger Merge Worker
55b85a3f6f [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: 999977ff27 -s ours am: 3b07b65009 -s ours am: 65f2bf3070 -s ours
am skip reason: subject contains skip directive

Change-Id: I7eadaceab63edc8b55a484856051599fec45e353
2020-03-12 19:46:57 +00:00
Automerger Merge Worker
b6848b1a03 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 1b2cdfc1e0 -s ours am: 506585dd49 -s ours am: 989bf746f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I2685b2400073129ac3a010d6e98b0e7c9b19b30b
2020-03-12 19:46:05 +00:00
Automerger Merge Worker
0962b120d2 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: bde8ce85e0 am: 31b91d9a9f am: f5543f6661 -s ours
am skip reason: subject contains skip directive

Change-Id: I6028dbcb3e3b37ed6febf2cba912eee03961b5ed
2020-03-12 19:44:51 +00:00
Automerger Merge Worker
a206bf1ae6 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: 391beafa9b am: c1f47778fa -s ours
am skip reason: subject contains skip directive

Change-Id: I6cc3aa94c56f3bde77264f88074fc94b39389260
2020-03-12 19:44:50 +00:00
Automerger Merge Worker
ef8c0d5464 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours am: 9b8c326fe8 -s ours am: 07c95b0b35 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c618f4b57b70cb1b787a2885775f0980b0a52bc
2020-03-12 19:43:28 +00:00
Automerger Merge Worker
046c46f073 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2 am: 5b1ea14640
Change-Id: If1619991aa322bb8c490990cd1360f8f8fe00b36
2020-03-12 18:52:38 +00:00
Automerger Merge Worker
c299b60577 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: 2c01f26e38
Change-Id: I3611389ba2ee752a9564f1051caee069928e48af
2020-03-12 18:33:45 +00:00
Automerger Merge Worker
5b1ea14640 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 75166350e2
Change-Id: Ifa995555e94b1f106b6222dcb663ff71bb712809
2020-03-12 18:14:43 +00:00
Automerger Merge Worker
2c01f26e38 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
Change-Id: If098a49eba7d3f7cee8495afd3a71d0e8bd01c80
2020-03-12 18:12:00 +00:00
Automerger Merge Worker
05017ca458 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911 am: 7baff55fd5
Change-Id: I53ec5ff4e27fc97b36336db03062e85178086a68
2020-03-12 18:01:41 +00:00
Automerger Merge Worker
9eead478cf [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348 am: 7ca652e32e am: d142acd3f8 -s ours
am skip reason: subject contains skip directive

Change-Id: I770b8d67e2aab5304348473a26adcf4fe1478ef1
2020-03-12 18:01:29 +00:00
Automerger Merge Worker
6bfc90ea6c Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433 am: f7e7def0a4 am: 0b883269c2
Change-Id: Ia6abe26b22ad4facd8de3cb258f7cba5fb1e7648
2020-03-12 18:00:38 +00:00
Automerger Merge Worker
009b355435 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours am: d4fd92c566 -s ours am: 3bc2ed9708 -s ours am: 4a0ba4a702 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib420cec8a5adb3a7cf6a52fd5987ebb1390b9718
2020-03-12 18:00:03 +00:00
Automerger Merge Worker
b536bd149d [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours am: 99eedee50f -s ours am: d782d88e5e -s ours am: c225b1ffcd -s ours
am skip reason: subject contains skip directive

Change-Id: Ib44e790d9fa92e9bc361ed802607797a3a72106d
2020-03-12 17:59:17 +00:00
Automerger Merge Worker
ec03f7feb2 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d am: 751daad079 am: c79de6aa02 am: 2ab475efff -s ours
am skip reason: subject contains skip directive

Change-Id: I44dc900265a78e7ae5d7f8b6262b999d5e6512f6
2020-03-12 17:57:55 +00:00
Automerger Merge Worker
ab8a93c842 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044 am: 5d79efa587 am: d809fcc3a1 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc8e097d512f32dce95d7a761bab847c4134372b
2020-03-12 17:57:53 +00:00
Automerger Merge Worker
b03770fb79 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: 08aec12201 -s ours am: 55f5ffbd04 -s ours am: d6c3db13c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I568d7df5a825bdedec7c27311ec750541f9bb71e
2020-03-12 17:57:05 +00:00