Automerger Merge Worker
54575ffdfa
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1
...
Change-Id: I689d269de3bbc9e96f6999721d99a1b6986b8dfb
2020-02-28 16:22:28 +00:00
TreeHugger Robot
fc2939ddd1
Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev
2020-02-28 16:14:33 +00:00
Automerger Merge Worker
c6ee91e5b1
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 767b00a6e8 am: 4f17dfd7fe
...
Change-Id: I0820aec867115798204ff5bbaa2544a7364b5a53
2020-02-28 16:04:33 +00:00
Automerger Merge Worker
2a7506b793
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e467048b39
...
Change-Id: I42125f0d37b57a72a343e137dcdcb557ab1194f8
2020-02-28 16:03:46 +00:00
Automerger Merge Worker
f927cb1ab3
Merge "Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: 48823ea702" into rvc-d1-dev-plus-aosp am: 5889d406c6
...
Change-Id: I6f2ee8b217c714126f85bd346a02e9a12f78c650
2020-02-28 16:03:39 +00:00
Automerger Merge Worker
5b368251e8
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 am: e86b816046
...
Change-Id: I52d439dcca44373fe5216209f3b1cf98ef0c5858
2020-02-28 16:03:33 +00:00
Automerger Merge Worker
1197fd7f84
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: 051020fc6a
...
Change-Id: Ibb56b87022616acec8c6396f1357af55445b24d5
2020-02-28 16:03:02 +00:00
Automerger Merge Worker
3ce15a6006
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 am: c3b12f302b
...
Change-Id: If4367dfa3e6f648c5556a3bba21aaaa9f83ecab6
2020-02-28 16:02:49 +00:00
Automerger Merge Worker
e86b816046
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415
...
Change-Id: Id80601383e934bc6f8f4ad5991f5272fdf4f65c9
2020-02-28 15:48:24 +00:00
Automerger Merge Worker
4f17dfd7fe
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 767b00a6e8
...
Change-Id: I650958bec0356363f924a14f6737ed4f7ca17a3a
2020-02-28 15:48:22 +00:00
Automerger Merge Worker
c3b12f302b
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5
...
Change-Id: I37e25bf184114eef9367c1a2844cbf6a7632ef01
2020-02-28 15:48:01 +00:00
Automerger Merge Worker
e467048b39
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415
...
Change-Id: I6e26ff60aab87f0a485658ffd4dac09031c4b290
2020-02-28 15:47:43 +00:00
Automerger Merge Worker
5889d406c6
Merge "Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: 48823ea702" into rvc-d1-dev-plus-aosp
2020-02-28 15:47:34 +00:00
Automerger Merge Worker
051020fc6a
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5
...
Change-Id: I5572ed5f43e0e57fae7ba03694c149ca11a1669d
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
537cc9305a
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: 48823ea702
...
Change-Id: Ief44a3be5a082f5a22db39549770a436e50a25f2
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
767b00a6e8
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
...
Change-Id: Ie36ad2199d53acaf7beb9ccbfdee374c1676c391
2020-02-28 15:46:31 +00:00
Automerger Merge Worker
9f61f4e415
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b
...
Change-Id: I6963808bde5c96e4ee93ef72de3135409a7947d2
2020-02-28 15:46:30 +00:00
Automerger Merge Worker
48823ea702
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
...
Change-Id: Ie244a4c73d7724acb84f6e77f6609d2d9f2d665f
2020-02-28 15:34:24 +00:00
Automerger Merge Worker
d5e10793e5
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
...
Change-Id: I0f96de0f766c0eccfd55e0b4ed3a5341be8884f9
2020-02-28 15:34:12 +00:00
TreeHugger Robot
c2153e244b
Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev
2020-02-28 15:33:44 +00:00
Shafik Nassar
3071821207
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev
2020-02-28 15:30:58 +00:00
Automerger Merge Worker
d543033483
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours am: 20e3b25292 -s ours am: aae2aa3d20 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:21:50 +00:00
Automerger Merge Worker
2c3c9e17dd
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 50637d69b9 -s ours am: 770505603c -s ours am: de42f96212 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:21:43 +00:00
Automerger Merge Worker
761ab005d7
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours am: c0561a1dba -s ours am: 22913eebea -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:21:37 +00:00
Automerger Merge Worker
aae2aa3d20
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours am: 20e3b25292 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:16:16 +00:00
Automerger Merge Worker
de42f96212
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 50637d69b9 -s ours am: 770505603c -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:09:17 +00:00
Automerger Merge Worker
22913eebea
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours am: c0561a1dba -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 07:09:12 +00:00
Automerger Merge Worker
64e72460dc
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a am: bcd758f57f am: d7b5b5a190 am: 5c5e0c892f
...
Change-Id: I8a61e88d5c08b4c45a867bc793e8e1aa533b6601
2020-02-28 07:04:08 +00:00
Automerger Merge Worker
770505603c
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 50637d69b9 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:54:13 +00:00
Automerger Merge Worker
20e3b25292
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:54:10 +00:00
Automerger Merge Worker
c0561a1dba
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:53:52 +00:00
Automerger Merge Worker
5c5e0c892f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a am: bcd758f57f am: d7b5b5a190
...
Change-Id: I3ce8894270c86e0133ff5d029096e315a8524380
2020-02-28 06:45:50 +00:00
Automerger Merge Worker
50637d69b9
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:28:30 +00:00
Automerger Merge Worker
7c636e673c
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:28:16 +00:00
Automerger Merge Worker
d7b5b5a190
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a am: bcd758f57f
...
Change-Id: I6e12f7e8e954b54b328dd2eb20a989ea690154a6
2020-02-28 06:23:00 +00:00
Automerger Merge Worker
fe066eab8d
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c
2020-02-28 06:16:47 +00:00
Automerger Merge Worker
bcd758f57f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a
...
Change-Id: Icd30b28c72ab2495737ecd91373ed4b25f1a63aa
2020-02-28 06:10:26 +00:00
TreeHugger Robot
594a5c71f5
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev
2020-02-28 06:04:46 +00:00
Peiyong Lin
fc4155a02c
Only show graphics driver option when the apk is available.
...
Previously we always show all options, this patch makes the dashboard
only shows the option when the driver apk is available.
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: Ifde5929d826d5ab542e855aa334546dd744b138b
2020-02-28 03:34:02 +00:00
Automerger Merge Worker
06867fc11a
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 3542ce579c am: 05f2b4b1fc
...
Change-Id: Iaba237207334a9898a46c07dcad6f61c0e7626a6
2020-02-28 02:28:25 +00:00
Automerger Merge Worker
be873287e2
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: 83c6fd40cc am: 7e5ad900da am: 67792e2a8c
...
Change-Id: I464a557f4485f9792b8a80d9c6cfd21796ab6ad4
2020-02-28 02:28:17 +00:00
Automerger Merge Worker
0ed408cb9e
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 47e84d67a9 am: 756ccff52e am: 6a2723d3d5
...
Change-Id: Ia2a983fc181de4a42c391405cf85e09ae9052512
2020-02-28 02:28:10 +00:00
Automerger Merge Worker
148bd0df7f
Merge "Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: 06c880fff2" into rvc-qpr-dev-plus-aosp am: bf5ab39101
...
Change-Id: I8ee468d805f8d8daa7eb554fda2325029312cfad
2020-02-28 02:27:51 +00:00
Automerger Merge Worker
7013c4423d
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 4712b73b69 am: c6df99a6ba
...
Change-Id: I62d4339a0ad20ca0a2dd4571741fee658149b751
2020-02-28 02:27:33 +00:00
Automerger Merge Worker
59b58f6eb4
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: d33d2ba23b am: 2e42539fbf
...
Change-Id: I2c936d6ccaa74f848c68395a70ad468b793855e7
2020-02-28 02:27:12 +00:00
Automerger Merge Worker
05f2b4b1fc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 3542ce579c
...
Change-Id: I1a5ac09c7d053537b66712baf227a889eaa2d9d5
2020-02-28 02:13:06 +00:00
Automerger Merge Worker
67792e2a8c
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: 83c6fd40cc am: 7e5ad900da
...
Change-Id: Iad7ac1fc9ba5f39a0c6575d971c733e23d417294
2020-02-28 02:12:48 +00:00
Automerger Merge Worker
6a2723d3d5
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 47e84d67a9 am: 756ccff52e
...
Change-Id: I5d07fd7f08e9e9801701ce410e7d3ab3139208eb
2020-02-28 02:12:43 +00:00
Automerger Merge Worker
bf5ab39101
Merge "Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 am: 06c880fff2" into rvc-qpr-dev-plus-aosp
2020-02-28 02:12:35 +00:00
Automerger Merge Worker
c6df99a6ba
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 am: 4712b73b69
...
Change-Id: Id15fc0d05f2ec14d9e39beedb7f457309127fec4
2020-02-28 02:12:29 +00:00
