Automerger Merge Worker
33e5c5abdf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 86c7343b49 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I47de09d88fa1dba0166d604610c640f0ec8f89f0
2020-03-10 00:08:56 +00:00
Automerger Merge Worker
8901108a05
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: 57f9809fbd am: 206800a06e am: 0a607b6faf
...
Change-Id: Id51bdd8e0028e4b189731ac91cf17fb7fa2d72f7
2020-03-09 23:53:47 +00:00
Automerger Merge Worker
b69e0825eb
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 5c1a4dcde4 am: 2575100329 am: 3235770dad
...
Change-Id: Ie20a9dfcb69bda404af97484b0751c20fee70e85
2020-03-09 23:53:34 +00:00
Automerger Merge Worker
0a607b6faf
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: 57f9809fbd am: 206800a06e
...
Change-Id: I7abf8a0f851c24ba509bc8db272e7f27537d0f69
2020-03-09 23:53:32 +00:00
Automerger Merge Worker
c059786aa2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 5dcf6647cd -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0df672cc1a14f03bf2c2bc13712b73ce64811055
2020-03-09 23:53:21 +00:00
Automerger Merge Worker
86c7343b49
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b232bed6fdd507d20008983611c2dd79e47944b
2020-03-09 23:53:20 +00:00
Automerger Merge Worker
ebd8d4e2db
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: ec2dfee42f am: d1b338cc23
...
Change-Id: I1abe1f80a73ac6265bf7cf32be3713f149e1170c
2020-03-09 23:53:13 +00:00
Automerger Merge Worker
140fed1e3a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7cd04f6f444f249641f5877746188794847e7ede
2020-03-09 23:53:09 +00:00
Automerger Merge Worker
3235770dad
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 5c1a4dcde4 am: 2575100329
...
Change-Id: Ibbe853e377ca7363adaed3e97898085fb6daf035
2020-03-09 23:35:52 +00:00
Automerger Merge Worker
5dcf6647cd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibb8959ba14f95b65231b0d11f84ebf9185756948
2020-03-09 23:34:34 +00:00
Automerger Merge Worker
38aa29d60f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6a88f6b6794a33fdb0722dd1bb65d8c5353500b1
2020-03-09 23:34:17 +00:00
Automerger Merge Worker
d1b338cc23
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: ec2dfee42f
...
Change-Id: I5e0d8bc8b1f91d14ad39075a17adeaf71d05d589
2020-03-09 23:34:17 +00:00
Automerger Merge Worker
206800a06e
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: 57f9809fbd
...
Change-Id: I50e236f45b2e6be803ea60602eea8e565e40853c
2020-03-09 23:34:16 +00:00
Automerger Merge Worker
57f9809fbd
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe
...
Change-Id: Iab0d2a4b0970d09c59abd3ffa59f076833863aa7
2020-03-09 23:08:59 +00:00
Automerger Merge Worker
2575100329
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 5c1a4dcde4
...
Change-Id: I218525afdea629e1fe7892d5f9947045ac8968fa
2020-03-09 23:08:59 +00:00
Automerger Merge Worker
ec2dfee42f
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe
...
Change-Id: I7152ebee368a8ddef5d66e265f8a3540de1ce64f
2020-03-09 23:08:50 +00:00
TreeHugger Robot
ea0486eef9
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-09 23:08:03 +00:00
Automerger Merge Worker
950169adbe
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d
...
Change-Id: I5540ada2462da22ccfb1d4887e0253618c8e6100
2020-03-09 22:51:22 +00:00
Automerger Merge Worker
5c1a4dcde4
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d
...
Change-Id: I46f226138e77636453500520a9cd1946469d7352
2020-03-09 22:51:16 +00:00
Hai Shalom
ed3fc8626d
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev
2020-03-09 22:32:49 +00:00
Hai Shalom
5bb13ebefe
[Settings] Use WifiConfiguration#setSecurityParams
...
Use WifiConfiguration#setSecurityParams instead of manually
initializing security params.
Bug: 150889755
Test: Created new connections and manually connected to open, WPA2,
WPA3, EAP and SUITE-B networks.
Change-Id: I42f4c21a37428ee87be14f6ba09dc54fa327054a
2020-03-09 22:25:56 +00:00
Automerger Merge Worker
dcf025c580
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9327cd5f4f am: c9827dd27e am: 4024c76b1b
...
Change-Id: Ia8c81d16e55d27ec507d8504f7a6ddd6f1ccd3ed
2020-03-09 21:19:14 +00:00
Automerger Merge Worker
4024c76b1b
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9327cd5f4f am: c9827dd27e
...
Change-Id: Ibd2bfb69c823623dfd3ad44eccde6d7c62d0913c
2020-03-09 20:58:37 +00:00
Automerger Merge Worker
9e04862762
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 72d0b2773b am: 0458c5a89e am: 6e8ed6dda1
...
Change-Id: I6885c705443f07c88e9436d7e5ceaba0a4de60ba
2020-03-09 20:53:18 +00:00
Automerger Merge Worker
853aabed66
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9b416d0092 am: f200a5d67f
...
Change-Id: I97594fd216728e96da3b244b765ff80ab28a6180
2020-03-09 20:51:28 +00:00
Bill Yi
71f3db68d3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I32bc5208c091da730f40937649dfacb4e91b0eed
2020-03-09 13:47:15 -07:00
Automerger Merge Worker
c9827dd27e
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9327cd5f4f
...
Change-Id: I607536787d3b44b193002d75edca5882b5c6f890
2020-03-09 20:34:42 +00:00
Automerger Merge Worker
6e8ed6dda1
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 72d0b2773b am: 0458c5a89e
...
Change-Id: I0138195a9b99dc4a4578a6c820c4e75ee89b6dd4
2020-03-09 20:33:59 +00:00
Automerger Merge Worker
f200a5d67f
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9b416d0092
...
Change-Id: Ia231323584e17c465d4478fc2800b0cf19165e00
2020-03-09 20:31:36 +00:00
Automerger Merge Worker
0458c5a89e
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 72d0b2773b
...
Change-Id: I5826f7661412707ee8530b122dde498d99893b1f
2020-03-09 20:26:53 +00:00
Automerger Merge Worker
9327cd5f4f
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de
...
Change-Id: I81c180aa3936913cd0b47f28741a47f2f8b7fdb1
2020-03-09 20:16:15 +00:00
Automerger Merge Worker
9b416d0092
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de
...
Change-Id: I69c77b10cc02383d96ca7138a4903727cd099cb1
2020-03-09 20:14:45 +00:00
Automerger Merge Worker
72d0b2773b
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
...
Change-Id: Ia1696bcb7e420ae4d1da0b604ce0ac53352d3b12
2020-03-09 20:08:32 +00:00
Automerger Merge Worker
976cf076de
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
...
Change-Id: I5ec80028f5e0d6cb98f87f625391a86eb8816510
2020-03-09 20:01:39 +00:00
Bonian Chen
613dcd9dfe
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev
2020-03-09 17:13:50 +00:00
Yanting Yang
7b7aadaa24
Corrected the indexing data of Tips and support
...
Update the screen title from Settings to Tips & support to display
correct breadcrumb in Settings Search.
Bug: 147851992
Test: visual
Change-Id: Id98488cfffdc86de43bf64f7e867e41a9dcc3142
2020-03-09 23:26:25 +08:00
Automerger Merge Worker
9efb5abd12
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6 am: 475c904773 am: 209ccc1a39 am: 0c7c3e014e
...
Change-Id: I27fcf40b85eb87262fcc4f381a9051fbeb4f59ba
2020-03-09 14:37:57 +00:00
Automerger Merge Worker
0c7c3e014e
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6 am: 475c904773 am: 209ccc1a39
...
Change-Id: If729e3c66e5ca2c8eaf13ab69c06b441e2a15beb
2020-03-09 14:33:02 +00:00
Automerger Merge Worker
44c68564e0
Merge "Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6" into rvc-d1-dev-plus-aosp am: c42a5d7502 am: d352ef642d
...
Change-Id: Ic4203cc461e993fac019764219f63a6f1b8d6a10
2020-03-09 14:33:01 +00:00
Automerger Merge Worker
f0cf92793f
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 0dfda78ac6 am: 2cce9a709a am: a443bb9435
...
Change-Id: Id8a380d0d7d28cb8f185632c4acb0fbb842b471a
2020-03-09 14:32:49 +00:00
Automerger Merge Worker
d352ef642d
Merge "Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6" into rvc-d1-dev-plus-aosp am: c42a5d7502
...
Change-Id: I9f4f7ba51830b152ccd74a125393acc60e9be9fa
2020-03-09 14:17:50 +00:00
Automerger Merge Worker
209ccc1a39
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6 am: 475c904773
...
Change-Id: I50400b79a557292b50733d4be0298dc50ec4cc79
2020-03-09 14:17:46 +00:00
Automerger Merge Worker
a443bb9435
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 0dfda78ac6 am: 2cce9a709a
...
Change-Id: I108b7dce7559deeeff8917b681966d7002b815d7
2020-03-09 14:17:40 +00:00
Automerger Merge Worker
88c82609f7
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: b28ffa4fe2 am: cdedbbf2fd am: 12944e9692 am: 288a821588
...
Change-Id: I33488b1d80457f775048da9bc73dfab0efd6462d
2020-03-09 14:10:47 +00:00
Automerger Merge Worker
90aa8f4f3f
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: 84f730c4c6 am: e76e43f29c am: e9669509a3
...
Change-Id: Ib0cd207acd94b1c801041876759bfcb1c045bcfb
2020-03-09 14:10:03 +00:00
Automerger Merge Worker
99c8c74b95
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: b28ffa4fe2 am: 606474fb18 am: 2b044e7f2e
...
Change-Id: If865f4310df565960886fc0b74ad4681a997bac4
2020-03-09 14:09:24 +00:00
Automerger Merge Worker
288a821588
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: b28ffa4fe2 am: cdedbbf2fd am: 12944e9692
...
Change-Id: Idcc7ecaddba9bdfa9aacc0ff039fcca5f7308e8f
2020-03-09 14:09:23 +00:00
Automerger Merge Worker
c42a5d7502
Merge "Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6" into rvc-d1-dev-plus-aosp
2020-03-09 14:09:15 +00:00
Automerger Merge Worker
475c904773
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6
...
Change-Id: I21872be84eaa2e22eca981fbe555e51c8bb61182
2020-03-09 14:09:08 +00:00
Automerger Merge Worker
2cce9a709a
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 0dfda78ac6
...
Change-Id: I40bdad221db39e5ecd3b0cc80e39d07d4716c2df
2020-03-09 14:09:07 +00:00
