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
Bonian Chen
0a00f0c44c
[Settings] Update TelephonyAPI in CallsDefaultSubscriptionController
...
use TelephonyManager's setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId
Bug: 150352656
Test: make
Change-Id: I61078c72c9a5374d4840869ecf9b65d4ce8ef85c
2020-03-12 20:57:09 +08:00
Automerger Merge Worker
a379802366
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514 am: c477088b78
...
Change-Id: Ib40608f610a02572a9bce0353901d81e534f71ff
2020-03-12 12:52:39 +00:00
Automerger Merge Worker
c477088b78
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af am: f980963514
...
Change-Id: I9dd4c474e4eeea74b79207469ea3e164ccf0da48
2020-03-12 12:42:21 +00:00
atrost
a84c219c30
Mark CHANGE_RESTRICT_SAW_INTENT as logging only
...
Test: m, flash
Test: adb shell dumpsys platform compat - the change is marked loggingOnly
Bug: 148009004
Change-Id: Ia04e8ef624a69feac7c68c858b48457385b9818a
2020-03-12 12:26:56 +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
f980963514
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: 01d61e49af
...
Change-Id: Idb839f020646f0abe4dbb338a7a15a7d1fbbe092
2020-03-12 12:15:29 +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
hughchen
728d63c014
Use values-night to control the dark mode background color
...
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
2020-03-12 19:47:44 +08: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
2febd6e59f
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458 am: 5f99e79af4
...
Change-Id: Ic6ee043610ef0df45ed819a9497f50cf171016b1
2020-03-12 11:31:11 +00:00
Edgar Wang
651edc5c44
Remove ignore test case
...
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
2020-03-12 19:21:36 +08: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
5f99e79af4
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3 am: 1e2416d458
...
Change-Id: I0cfa9d5863e02c5698740f7871d2c1ade41e8b8d
2020-03-12 11:19:07 +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
1e2416d458
[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours am: 56274ffaa3
...
Change-Id: I415dc1c990098be2e95751fbe79dcc90d5e63ffa
2020-03-12 11:02:03 +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
Automerger Merge Worker
aa1a8dc3a5
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009 am: 8fdc20fd87
...
Change-Id: I0ca49ec6ef62db9de74c1e068e22b870f2cfdc76
2020-03-12 10:41:51 +00:00
Automerger Merge Worker
56a95edb34
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 10:41:33 +00:00
Automerger Merge Worker
443230b2bf
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 10:41:06 +00:00
Automerger Merge Worker
ca4f008287
[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
...
Change-Id: I5eb9080c5f33d45f907df7f9d2628fc38da41022
2020-03-12 10:40:33 +00:00
Automerger Merge Worker
193d8cf727
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c am: d37f5b5a7a
...
Change-Id: Ia57cf9fb60941b1bac182f096cc4fcab438059cc
2020-03-12 10:40:31 +00:00
Automerger Merge Worker
b167885376
[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 skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279
2020-03-12 10:40:12 +00:00
TreeHugger Robot
8697de6be3
Merge "DO NOT MERGE" into qt-qpr1-dev
2020-03-12 10:36:01 +00:00
Automerger Merge Worker
8fdc20fd87
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b am: 5fe624a009
...
Change-Id: Id1a853afd506b5570a17a977d5a2c1dc4d77b7dc
2020-03-12 10:20:25 +00:00
Automerger Merge Worker
135d77ae70
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 10:20:16 +00:00
Automerger Merge Worker
5d170c119a
[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 skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f
2020-03-12 10:19:56 +00:00
Automerger Merge Worker
74ae03d4a8
[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: I6503f9e76785858f5a0b17e4699f8ebd38f75787
2020-03-12 10:19:18 +00:00
Automerger Merge Worker
d37f5b5a7a
[automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: 4cc152835c
...
Change-Id: Ic6a1170dbfd47e22a16a0548568582f0be7e7ad1
2020-03-12 10:19:14 +00:00
Automerger Merge Worker
4302d438b0
[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 10:18:43 +00:00
Automerger Merge Worker
5fe624a009
Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b
...
Change-Id: Ib4a750e64f0e012e94898c15e1f369561231299a
2020-03-12 09:55:28 +00:00
Automerger Merge Worker
999977ff27
[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 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0
[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 09:55: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
