Treehugger Robot
1e53efc4c4
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Xin Li
3cbc718e81
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours am: 8cabf84832
...
am: 2f464241a1
2019-08-14 14:23:33 -07:00
Xin Li
2f464241a1
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours
...
am: 8cabf84832
2019-08-14 13:56:58 -07:00
Xin Li
8cabf84832
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: 9821df1b1f
2019-08-14 13:32:06 -07:00
Xin Li
9821df1b1f
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
2019-08-14 11:35:21 -07:00
android-build-team Robot
6f843dbcfd
Snap for 5800161 from 7933af0273 to qt-qpr1-release
...
Change-Id: I3c0f015275c3ab7e6bb580952a1b35605a756de0
2019-08-14 05:26:38 +00:00
Jordan Liu
eda0936e38
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0 am: b377a593b7 am: 1fc63fc444
...
am: 028f2c87a1
2019-08-13 19:13:45 -07:00
Jordan Liu
028f2c87a1
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0 am: b377a593b7
...
am: 1fc63fc444
2019-08-13 19:01:30 -07:00
Jordan Liu
1fc63fc444
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
...
am: b377a593b7
2019-08-13 18:48:49 -07:00
Jordan Liu
b377a593b7
Merge "Allow radio info on phones with no subscription"
...
am: 19d1f890a0
2019-08-13 18:37:15 -07:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758
Snap for 5674421 from 4a949c0640 to pi-platform-release
...
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Yi Jiang
e6af4e136b
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
2019-08-12 18:51:42 -07:00
Yi Jiang
943e7b34e8
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
2019-08-12 18:41:16 -07:00
Yi Jiang
7933af0273
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
2019-08-13 01:28:31 +00:00
Jordan Liu
655c1be579
Allow radio info on phones with no subscription
...
Some info is still helpful for debugging in these cases.
Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
android-build-team Robot
00cd8349ca
Snap for 5794870 from bde8c0a64d to qt-qpr1-release
...
Change-Id: Ieeafbad5aec7848733d196eb2769edbdc751b1b4
2019-08-10 23:16:16 +00:00
Arc Wang
5776e726d0
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
am: bde8c0a64d
2019-08-08 01:30:51 -07:00
Arc Wang
3e64c28534
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
am: bde8c0a64d
2019-08-08 01:21:32 -07:00
Arc Wang
bde8c0a64d
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
1. Only support EAP-TLS for WPA3-Enterprise 192-bit
2. Remove "Do not validate" from the CA certificate menu
3. Remove "Do not provide" from user certificate menu
Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
Merged-In: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
2019-08-08 14:52:08 +08:00
Yi Jiang
811908f568
Don't show suggestion slice if 'Screen attention' is already on
...
Bug: 137259771
Fix: 137259771
Test: Manually
Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit 06f0bd6d4e
2019-08-05 17:06:24 +00:00
android-build-team Robot
c2953cfc94
Snap for 5779208 from 31cc369a4d to qt-qpr1-release
...
Change-Id: I2dc6eebc9364f22d4e8be606ab84d199ac6a5e3f
2019-08-04 23:14:55 +00:00
Christine Franks
4f05fc52bf
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
2019-08-04 01:38:30 -07:00
Christine Franks
c18d0d3090
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
2019-08-04 01:37:51 -07:00
Christine Franks
8e7f23910f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
2019-08-04 01:37:50 -07:00
Christine Franks
e4ffff1ce5
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: c586c923aa
2019-08-04 01:36:00 -07:00
Christine Franks
3cb194c627
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: caebfbe9c9
2019-08-04 01:34:46 -07:00
Christine Franks
e003f38b53
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
2019-08-04 01:32:21 -07:00
Christine Franks
5bf177fa50
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:55:55 -07:00
Christine Franks
c586c923aa
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:55:55 -07:00
Christine Franks
2b07a7e818
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:55:36 -07:00
Christine Franks
caebfbe9c9
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:55:33 -07:00
Christine Franks
31cc369a4d
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
2019-08-04 00:53:35 -07:00
Christine Franks
c48918dac0
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
2019-08-04 00:53:29 -07:00
android-build-team Robot
bd0170ca58
Snap for 5778794 from 063cc34713 to qt-qpr1-release
...
Change-Id: I9e0c0f494dbb126e4e7666add8d8f1a23839b800
2019-08-03 23:13:28 +00:00
android-build-team Robot
d767898bf1
Snap for 5778854 from 37b38f872f to qt-c2f2-release
...
Change-Id: I65f2c3f99c9767109fb4aa653b2e4afcfeedfa51
2019-08-03 23:02:29 +00:00
Christine Franks
37b38f872f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
2019-08-03 14:47:40 +00:00
Christine Franks
ea14373666
[DO NOT MERGE] Update title for null uri when setting changes
...
Currently, the title will not update at all if set to silent.
Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
2019-08-03 01:00:31 +00:00
Android Build Merger (Role)
1c98867b18
Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp
2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 3448917d8e
2019-08-01 23:00:21 -07:00
Edgar Wang
09f2469440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
2019-08-01 23:00:15 -07:00
Edgar Wang
3448917d8e
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
063cc34713
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
345315c440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:04 -07:00
Edgar Wang
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00:00
android-build-team Robot
3c6f2108a8
Merge cherrypicks of [9131405, 9130772, 9131110, 9131093, 9131019, 9131394, 9131395, 9131396, 9131406, 9131480, 9131397] into qt-c2f2-release
...
Change-Id: Ib91991cbbbda41bae347ca9f17e1405e9d960f89
2019-08-02 04:02:33 +00:00
Daniel Solomon
eb15083e1b
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
(cherry picked from commit 56574d5924
2019-08-02 04:00:51 +00:00
Daniel Solomon
2b40b40a95
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 4c1fa1a5d1
2019-08-01 13:54:52 -07:00
