Commit Graph

61106 Commits

Author SHA1 Message Date
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
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
Automerger Merge Worker
f5543f6661 [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
Change-Id: Iff3e56d49b9efca9f5a26a84e331d025aefc7583
2020-03-12 17:55:21 +00:00
Automerger Merge Worker
c1f47778fa [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: 391beafa9b
Change-Id: I66190ededed6a3c34dc887b389b743e2c89c3201
2020-03-12 17:55:18 +00:00
Automerger Merge Worker
07c95b0b35 [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 skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: Ied32a02876098c7fbe6e9f836ade94153bf5dfe6
2020-03-12 16:58:29 +00:00
Automerger Merge Worker
31b91d9a9f [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
Change-Id: Ie7f73d3599572b12b432ded791a89563ef489317
2020-03-12 16:50:13 +00:00
Automerger Merge Worker
391beafa9b [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c
Change-Id: I6e1448ada55f09c0010226f03a1ba8a9c5dff08b
2020-03-12 16:50:11 +00:00
Automerger Merge Worker
9b8c326fe8 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: c90737a257 -s ours
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I43461bde7b809d489b240ad3d410e0150b1f3344
2020-03-12 16:49:16 +00:00
Automerger Merge Worker
7baff55fd5 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56 am: 67e5d0e911
Change-Id: Ib19c16bf8882a7a40921ece5e58965509e2d9246
2020-03-12 16:39:31 +00:00
Automerger Merge Worker
d142acd3f8 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348 am: 7ca652e32e
Change-Id: I13a80cf8769689fe58715a076348731ad7f5b021
2020-03-12 16:39:22 +00:00
Automerger Merge Worker
0b883269c2 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433 am: f7e7def0a4
Change-Id: Ic19c224bc83a178b678f3e0c2e17cf3d14fcd05b
2020-03-12 16:38:42 +00:00
Automerger Merge Worker
4a0ba4a702 [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ib8a9454ea4f36aa6955e2cd99ec630ce819f2776
2020-03-12 16:38:00 +00:00
Automerger Merge Worker
c225b1ffcd [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ib7342310c17c8187b6d33f04bd3e899cba438f9b
2020-03-12 16:37:25 +00:00
Automerger Merge Worker
2ab475efff [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
Change-Id: Iff1d356ffa298954e86b0687133617f24e374a8b
2020-03-12 16:36:32 +00:00
Automerger Merge Worker
d809fcc3a1 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044 am: 5d79efa587
Change-Id: I482a6a07fa98b95fad6553027365f4086db3431f
2020-03-12 16:36:30 +00:00
Automerger Merge Worker
d6c3db13c7 [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 skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I4871d43d6e77b11ebb77fe738c427c4eb9d1101f
2020-03-12 16:36:10 +00:00
Automerger Merge Worker
67e5d0e911 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: 60b59c3a56
Change-Id: I727ee8ed6cf14ae75f49da9136f9f34b75033450
2020-03-12 16:19:38 +00:00
Automerger Merge Worker
7ca652e32e [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: fd8934f348
Change-Id: I65af0a2c35539093185de69903edeefb44f070ae
2020-03-12 16:19:32 +00:00
Automerger Merge Worker
f7e7def0a4 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 8dfa636433
Change-Id: I1b3492329d34e31a641e2c3c677c5511d3f9f6b3
2020-03-12 16:19:25 +00:00
Automerger Merge Worker
3bc2ed9708 [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I7e510c9173551fd44d049a91444bf96dcd8d4388
2020-03-12 16:19:19 +00:00
Automerger Merge Worker
d782d88e5e [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I2cd4d12721f2965adcc0aaf6c5ee9d9a7422692c
2020-03-12 16:19:10 +00:00
Automerger Merge Worker
c79de6aa02 [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
Change-Id: I72cbb0bc62253b0c18f40f5ef2b1a9ed30f4815a
2020-03-12 16:18:45 +00:00
Automerger Merge Worker
5d79efa587 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044
Change-Id: Ica43af29af88dc47eebc007421bad3ea7ccff31f
2020-03-12 16:18:43 +00:00
Automerger Merge Worker
55f5ffbd04 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: 08aec12201 -s ours
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: Ibe77fbfeaa783ddcc740f614ee570a071288c721
2020-03-12 16:14:43 +00:00
Automerger Merge Worker
60b59c3a56 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af
Change-Id: I430ce4669bb4f56a4a62d8dbeed09c269db6c275
2020-03-12 16:13:19 +00:00
Automerger Merge Worker
fd8934f348 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3
Change-Id: I064ad39dd98fd5442c1fc1806205e1a9e8fac198
2020-03-12 16:13:11 +00:00
Automerger Merge Worker
8dfa636433 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
Change-Id: I29ec48cdee97305a70dba7fa76f28cb1a48ae5c9
2020-03-12 16:12:46 +00:00
Automerger Merge Worker
d4fd92c566 [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ibd2300aad66b2613a0ec5e4e9c42a50dde1ad9af
2020-03-12 16:12:10 +00:00
Automerger Merge Worker
99eedee50f [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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Iee76dec583df021474f5dee13eb1b2085b126bb7
2020-03-12 16:02:22 +00:00
Automerger Merge Worker
751daad079 [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
Change-Id: Idef6515e39b51e3a03cac2daaa8a8f790c85a87e
2020-03-12 16:01:42 +00:00
Automerger Merge Worker
da93669044 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c
Change-Id: Id580a25bcf5f69aa555dd0fed9087527c36fcedf
2020-03-12 16:01:40 +00:00
Automerger Merge Worker
08aec12201 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I01ba5349a4fef2ebf12a4e3d579e57f5e1e3b7fc
2020-03-12 16:00:46 +00:00
Automerger Merge Worker
0b733d4bbf Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 am: 6714c01dd6 am: eae9ffda6a am: 18f6ceed10
Change-Id: I449771a85bd95c9d16c4ffd304b9502f07ba5007
2020-03-12 12:15:46 +00:00
Automerger Merge Worker
c50be4a915 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2 am: b39c97b7e8 am: 678a137916
Change-Id: Iba05f50ab2cf2bf09dfc0e213bc33dd578b5ed6c
2020-03-12 12:15:35 +00:00
Automerger Merge Worker
18f6ceed10 Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 am: 6714c01dd6 am: eae9ffda6a
Change-Id: I7159f7c0f5d2254eaa5b242f0400653dc6717fa0
2020-03-12 12:04:11 +00:00
Automerger Merge Worker
678a137916 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2 am: b39c97b7e8
Change-Id: I6e4e895b166609126b63106d5efa1a63db1213ec
2020-03-12 12:03:54 +00:00
Alex Johnston
01d61e49af Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-12 12:00:49 +00:00
Automerger Merge Worker
eae9ffda6a Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 am: 6714c01dd6
Change-Id: Ifbc48adf4e12ff4b9fe3c009c04e7fd4f9312b83
2020-03-12 11:42:14 +00:00
Automerger Merge Worker
b39c97b7e8 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2
Change-Id: I557166bb0dc59de8660395c5dbbce8ad5430ed0b
2020-03-12 11:41:58 +00:00
Automerger Merge Worker
6714c01dd6 Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72
2020-03-12 11:31:41 +00:00
Automerger Merge Worker
a7c8f74cb2 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883
Change-Id: Iec491d3c73c041e0c828a3c90575f3f3dd7d99ab
2020-03-12 11:31:30 +00:00