Commit Graph

61710 Commits

Author SHA1 Message Date
Nathan Harold
adbc1ac905 Disable 5G Scanning in NetworkScanHelper
5G has two operating modes: stand-alone and non-standalone.
The vast majority of support is currently for non-standalone
mode. Because Android currently cannot tell the difference
between the supported modes in the modem, and because a device
that supports non-standalone mode shoudn't scan for 5G during a
PLMN selection procedure (it can't camp on 5G, hence non-
standalone mode), disable 5G scans by default and revisit once
modem support exists to distinguish between the two modes. This
avoids alternatives such as allowing 5G to be silently removed
in the RIL or for a 5G scan to be performed which doesn't provide
the user any meaningful options.

A separate bug has been filed (b/151119451) to revisit this logic
once the modem supports interrogation of its 5G capability.

Bug: 149528140
Test: compilation
Change-Id: I4e19b43e6529b5c673bb54c6f8f94c44a7c5bee5
2020-03-09 19:39:56 -07:00
Chen Chen
24344d5001 MetricId: Avoid byte[] and string ambiguity
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: I2d1c3896d5d850a81a987aded14e3f0c05558e8c
2020-03-10 01:56:04 +00:00
Automerger Merge Worker
e46e6d3f90 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: ef8818e1b6 am: c18a46e58b
Change-Id: Id8e3d99001049affea131a48d23b9644892eba2a
2020-03-10 01:42:42 +00:00
Automerger Merge Worker
6bee27a470 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 8e3a79813d am: 8e30c80477
Change-Id: I2446ec82007a84911c2fd8fcd9d50453ca5fc799
2020-03-10 01:25:13 +00:00
Automerger Merge Worker
3736b16cfe Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: c4f441876b
Change-Id: Ieaeb1397d33ba8ee3f48ace8b35253889405b529
2020-03-10 01:24:44 +00:00
Automerger Merge Worker
c18a46e58b Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: ef8818e1b6
Change-Id: Idd58d4db0e217c696af75fa8cffcb7302442b79c
2020-03-10 01:24:34 +00:00
Automerger Merge Worker
ef8818e1b6 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915
Change-Id: Ife852ac3a31b4d3170f9d2f3a75a1c2d24ed9454
2020-03-10 01:06:20 +00:00
Automerger Merge Worker
8e30c80477 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 8e3a79813d
Change-Id: Ic64da459b673439fd1e0ef9936348ef04f0745f5
2020-03-10 01:06:01 +00:00
Automerger Merge Worker
c4f441876b Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915
Change-Id: I6ba1fcb55c5e3da3f450aa26dd7e5f6dcbf6e7ee
2020-03-10 01:05:39 +00:00
Automerger Merge Worker
8e3a79813d Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97
Change-Id: Idb4dfadbac5a73cf606e56bb4b310b6d7399464c
2020-03-10 00:48:49 +00:00
Automerger Merge Worker
7d797c2915 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97
Change-Id: Ifc0701181ccbba715f7ac59bee6450398acf76b8
2020-03-10 00:48:49 +00:00
TreeHugger Robot
7eada07c97 Merge "Corrected the indexing data of Tips and support" into rvc-dev 2020-03-10 00:33:41 +00:00
Automerger Merge Worker
9d639465bb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 86c7343b49 -s ours am: 33e5c5abdf -s ours
am skip reason: subject contains skip directive

Change-Id: I9b67a3d978ed8b9699a80a478a693d2f358d4f5e
2020-03-10 00:29:28 +00:00
Daniel Bright
b9fd856273 [Mainline] Remove NETWORK_TYPE_LTE_CA
NETWORK_TYPE_LTE_CA is not bubbled up outside of the Telephony Packages

Test: make,flash
Bug: 147111233
Merged-In: I1eed95ee1060aff953306a696e91e0205acdad7c
Change-Id: I1eed95ee1060aff953306a696e91e0205acdad7c
2020-03-09 17:27:06 -07:00
Automerger Merge Worker
e9ac1b0f7d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 5dcf6647cd -s ours am: c059786aa2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iadce372f95e6691ae070ecd93b72efafcf6a7c9e
2020-03-10 00:09:34 +00:00
Automerger Merge Worker
0259039d14 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours am: 140fed1e3a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1682576c4ba549ba1222eb2ae7b98fe477b5576
2020-03-10 00:09:17 +00:00
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
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
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
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
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
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
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