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
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
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
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
2020-03-12 16:36:10 +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
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
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
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
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
f6a3069cc0
[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 am: 779aa123c7 am: 3e46f0e167 -s ours am: 373caf5ddb -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:48:53 +00:00
Automerger Merge Worker
377ec34e49
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56 am: bad44347d5 am: aeda53e535
...
Change-Id: Ia55bf223a64311fa307a81d0b4bd7f8131104e2e
2020-03-12 07:48:45 +00:00
Automerger Merge Worker
373caf5ddb
[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 am: 779aa123c7 am: 3e46f0e167 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:32:49 +00:00
Automerger Merge Worker
aeda53e535
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56 am: bad44347d5
...
Change-Id: I46ea4ab65f975962028bea4042e0ec340d7c35e4
2020-03-12 07:32:16 +00:00
Automerger Merge Worker
a82820daaa
[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: 85c9d1dd97 -s ours am: 3574af3fa1 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:24:35 +00:00
Automerger Merge Worker
5177fe5c61
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 am: 189116b4da -s ours am: 521e3cde98 -s ours
...
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 07:24:28 +00:00
