Automerger Merge Worker
b5bfc99ee5
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328 am: cf0e5bb296
...
Change-Id: I3ec524c950ec2c95aefe97c48ede7cdac75285aa
2020-03-13 15:17:27 +00:00
Automerger Merge Worker
cf0e5bb296
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059 am: 62d9891328
...
Change-Id: I26222d3b9175e4b85916a645124ea8a4a0787da6
2020-03-13 15:00:25 +00:00
Automerger Merge Worker
62d9891328
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
...
Change-Id: I317bd4c4e23b3738f95b90950e64c1a0181925b9
2020-03-13 14:45:11 +00:00
Alex Johnston
37fa5bd059
Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev
2020-03-13 14:28:15 +00:00
Automerger Merge Worker
627642cc0d
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 1b87244013
...
Change-Id: I984e3390f329188362b9a92b84a24a4d9a9adc73
2020-03-13 10:05:24 +00:00
Automerger Merge Worker
1b87244013
Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53
...
Change-Id: Ic71e492c19a700e05654cb6b1dfb526fff012e7e
2020-03-13 09:51:57 +00:00
Automerger Merge Worker
f08d965b53
Merge "Fix tests" into rvc-dev am: 6d8e0fed61
...
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
2020-03-13 09:38:45 +00:00
TreeHugger Robot
6d8e0fed61
Merge "Fix tests" into rvc-dev
2020-03-13 09:27:16 +00:00
Automerger Merge Worker
1d2fee6c5a
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff am: d86df5d487
...
Change-Id: Ie0d756b795c9f7721f7ca20b03fd7eee5a748d48
2020-03-13 05:39:17 +00:00
Automerger Merge Worker
d86df5d487
Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff
...
Change-Id: I53566a529f76c804004941076c4549ab873b470c
2020-03-13 05:15:10 +00:00
Automerger Merge Worker
e94cbd98ff
Merge "Remove ignore test case" into rvc-dev am: ad30345078
...
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
2020-03-13 05:01:38 +00:00
Edgar Wang
ad30345078
Merge "Remove ignore test case" into rvc-dev
2020-03-13 04:45:59 +00:00
Automerger Merge Worker
e6502b753a
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044 am: 897eea3bc4
...
Change-Id: Ic01687809ab05464a514ffeb4bbfac0c78429829
2020-03-13 04:00:23 +00:00
Automerger Merge Worker
897eea3bc4
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33 am: 3f6c723044
...
Change-Id: Ic1db6caf15ef6aed31e27bf1aedf19c0dc9a93cc
2020-03-13 03:40:08 +00:00
Automerger Merge Worker
3f6c723044
Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
...
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
2020-03-13 03:27:02 +00:00
TreeHugger Robot
89a6fafa33
Merge "Use values-night to control the dark mode background color" into rvc-dev
2020-03-13 03:13:27 +00:00
Automerger Merge Worker
00ef0309cf
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d am: 424982b66a
...
Change-Id: Ideabb4637cd2ad3e51f3680418f59b0279daa117
2020-03-12 23:08:56 +00:00
Automerger Merge Worker
424982b66a
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585 am: ed92f8425d
...
Change-Id: Iea8a2da198c79c5a0924d392a7dec6b7da825f89
2020-03-12 22:06:26 +00:00
Automerger Merge Worker
ed92f8425d
Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585
...
Change-Id: I391dd964c025de214e6f59bee1a26a6e426de0ac
2020-03-12 21:53:58 +00:00
TreeHugger Robot
4a1f517585
Merge "Remove nested scrolling" into rvc-dev
2020-03-12 21:44:27 +00:00
Julia Reynolds
49f40ee77b
Fix tests
...
Fixing one of them by removing an unneeded setting
Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Automerger Merge Worker
920f07228f
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: af05a79dd1
...
Change-Id: I0ab4fde26ef0f9291029b06a55a46c7d1b0d5e60
2020-03-12 20:31:19 +00:00
Automerger Merge Worker
af05a79dd1
Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e
...
Change-Id: I4e90d4b96edb74c99ad02fb52c499e66e71d3b97
2020-03-12 20:18:24 +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
Zhen Zhang
0ad0a50538
Merge "Log some actions for changing wifi hotspot config" into rvc-dev
2020-03-12 19:47:42 +00:00
Julia Reynolds
a7a44fe058
Remove nested scrolling
...
Test: manual
Fixes: 151334452
Change-Id: I4d2f5eb268cda1e1a19187e2812fa026f44484f9
2020-03-12 15:20:39 -04:00
Automerger Merge Worker
496773632f
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22 am: f63c3aca11
...
Change-Id: I702990ba79769646b5390f1d490c67bfbc3d88c6
2020-03-12 18:30:30 +00:00
Automerger Merge Worker
f63c3aca11
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30 am: 9469b91a22
...
Change-Id: I47e5c577bfa338ac3160ee8c4274717ed40cb26f
2020-03-12 18:09:32 +00:00
Automerger Merge Worker
9469b91a22
Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
...
Change-Id: Iedfb2e19dfd12a5f6be25be28556d0d1fbc95def
2020-03-12 17:53:36 +00:00
Alex Johnston
341f995971
DPC can be uninstalled in personal profile in New COPE
...
* For an organization-owned device, the DPC should be able to
be uninstalled in the personal profile. Previously, the
observed behaviour was that the uninstall button in the App
Info Screen was being greyed out.
* This was because the previous logic did not allow for
uninstalling any app which has a profile owner or device
owner on *any* user.
* This CL updates this logic, such that, for non-system apps
uninstalling is blocked only if the app has a profile owner
or device owner for the current calling user.
Bug: 149381804
Test: Manual testing
atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00: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
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
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
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
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
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
