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
2020-03-12 16:49:16 +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
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
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
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
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
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
2020-03-12 16:00:46 +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
Automerger Merge Worker
a99bfeadf9
Merge "[Settings] Code refactor" am: a7a9863a52
...
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4
...
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52
Merge "[Settings] Code refactor"
2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4
Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION"
2020-03-12 11:06:51 +00:00
Automerger Merge Worker
56274ffaa3
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I17465ae7a650f532680446dc72eb315b9e16ba2d
2020-03-12 10:49:42 +00:00
TreeHugger Robot
8697de6be3
Merge "DO NOT MERGE" into qt-qpr1-dev
2020-03-12 10:36:01 +00:00
Automerger Merge Worker
bde8ce85e0
[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: I6a6e037cc80eb9f2cc505158e5f937b287c05254
2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c
...
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257
[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
2020-03-12 09:53:24 +00:00
shafik
143ec3ec2b
Update ManageExternalStorageDetailsTest setUidMode
...
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
2020-03-12 09:43:55 +00:00
Automerger Merge Worker
b2a718f62f
[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 skip reason: subject contains skip directive
Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb
[automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d
[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a
[automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
2020-03-12 09:21:48 +00:00
Bonian Chen
bfc8714e1f
[Settings] Code refactor
...
Code refactor.
Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Bonian Chen
a9d89cfd60
[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION
...
Add flag for startActivity() with URI.
Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
2020-03-12 16:14:00 +08:00
Automerger Merge Worker
85c9d1dd97
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours am: 5a870aa5d5 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 06:54:47 +00:00
Automerger Merge Worker
189116b4da
Merge "[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours" into rvc-d1-dev-plus-aosp
2020-03-12 06:54:30 +00:00
Automerger Merge Worker
236ef7c6bb
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 06:54:25 +00:00
Automerger Merge Worker
57dee00e9c
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316
...
Change-Id: I398b4c88516a2a8736cf48f788415a6651e23f0a
2020-03-12 06:54:23 +00:00
Automerger Merge Worker
977a698823
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25
...
Change-Id: I87825756a6920e39019c5dce12d34afb57c1f02f
2020-03-12 06:54:18 +00:00
Automerger Merge Worker
5a870aa5d5
[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 06:42:37 +00:00
Automerger Merge Worker
cae2447a56
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2
...
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev
2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e
...
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
2020-03-12 06:39:18 +00:00
