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
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
Tim Peng
dd39f44344
Handle ransferring state in output switcher
...
-Add subtitle on Slice item for transferring and failed case
-Add test cases
Bug: 150903460
Test: make -j50 RunSettingsRoboTests
Change-Id: I45fee20194dc6c9ec86ca88158393dfda455d0c0
2020-03-12 16:29:30 +08:00
Bonian Chen
35904059d0
[Settings] Fix behavior of mobile data plan
...
Fix UI issue.
Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
2020-03-12 16:26:51 +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
Zhen Zhang
63c7c202d7
Log some actions for changing wifi hotspot config
...
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed
Added tests for logging actions in each controller's test.
Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest
Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07: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
Automerger Merge Worker
cfcc6d5b3c
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316 am: 57dee00e9c am: b8821ea3a5
...
Change-Id: I125a268afc5975631be33516a2de050c31580fa9
2020-03-12 07:24:21 +00:00
Automerger Merge Worker
816f3b693c
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823 am: ab91b6fc7d
...
Change-Id: I7ce1b6483994e8571d50c77e45ff0bc60e3fe4e4
2020-03-12 07:24:10 +00:00
Automerger Merge Worker
3e46f0e167
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
...
Change-Id: Ia671f444da9ce999aa5a02022f38bbaf6ce033ab
2020-03-12 07:11:00 +00:00
Automerger Merge Worker
3574af3fa1
[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 skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55
2020-03-12 07:10:48 +00:00
Automerger Merge Worker
521e3cde98
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 skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7
2020-03-12 07:10:42 +00:00
Automerger Merge Worker
bad44347d5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56
...
Change-Id: I144180075010cdce57933d3d5917dfba2aa66119
2020-03-12 07:10:06 +00:00
Automerger Merge Worker
b8821ea3a5
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316 am: 57dee00e9c
...
Change-Id: I4409045cf67050612ce502f3107d96e25da165c6
2020-03-12 07:09:53 +00:00
Automerger Merge Worker
ab91b6fc7d
Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823
...
Change-Id: I298f7c11b041c90716a27437a571537d156d5839
2020-03-12 07:09:31 +00:00
