Commit Graph

23229 Commits

Author SHA1 Message Date
Samuel Tan
d54bbd5193 Allow domain suffix match to be set in UI for EAP configurations
Add a "domain" field that allows the user to specify a domain
suffix match for an EAP network configuration. This field
will only be available when the user specifies a CA certificate for
an EAP-PEAP, EAP-TLS, or EAP-TTLS network. Under the hood, the
value entered into this field will be passed to WPA supplicant
as the |domain_suffix_match| configuration variable.

BUG: 25180141
Change-Id: Ib69b9519f475e90e40441ddff61c80be43cf624b
TEST: On angler, domain field appears for the EAP-PEAP, EAP-TLS
TEST: and EAP-TTLS networks.
2016-01-29 15:40:43 -08:00
Samuel Tan
03a117bcfa Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.

BUG: 26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
2016-01-26 17:45:32 -08:00
Samuel Tan
30f7b5a7cf Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.

Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.

BUG: 26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
2016-01-26 17:45:32 -08:00
Samuel Tan
933b6ed98f Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.

Also:
- change the wording of the default option for
  EAP CA and user certificates from "(unspecified)" to
  "Please select", to make it obvious that a choice
  needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.

BUG: 26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
2016-01-26 17:23:11 -08:00
Sanket Padawe
30e812b731 [DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug: 15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
2016-01-26 16:51:39 -08:00
Rubin Xu
55d7fcbfc2 Merge "Support multiple CA certs when editing a saved Wifi network." into mm-wireless-dev 2016-01-27 00:26:59 +00:00
Rubin Xu
e34ea11fca Support multiple CA certs when editing a saved Wifi network.
SSID with multiple CA certs can only be added programmtically. However it
can still be edited in the UI by long-pressing the item when currently
connected to the network. This change makes sure the UI shows up with
 meaningful indications that the SSID is configured with multiple CA certs.

Bug: 22547958
Change-Id: I5d42313efb141db521dd09ff3fbc520915b6fb79
2016-01-27 00:25:10 +00:00
Shishir Agrawal
2e1370e9a5 DO NOT MERGE : Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
2016-01-26 09:32:39 -08:00
Jack Yu
e6479d5785 DO NOT MERGE - Added a new broadcast receiver to handle Brzail channel 50 area info
Moved the area info handler from CellBroadcastReceiver to
CellBroadcastAreaInfoReceiver.

bug: 25628456
Change-Id: I2c7c6bb83245fcb6d9cc7b5dce7496e906160bab
2015-12-21 22:33:50 +00:00
Amit Mahajan
cd74ebb53d Code cleanup including removing direct references to IMS classes.
Bug: 25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
2015-12-15 16:43:32 -08:00
Amit Mahajan
8bf272b44d Validate the uri received in ApnEditor.
Uri should only refer to telephony carriers and no other provider.

Bug: 11184401
Change-Id: I38c25a37a48883f971c4f405a98db5066a707909
2015-12-09 20:48:09 -08:00
Hyejin Kim
24233d439e Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings

BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-09 20:47:53 -08:00
Sanket Padawe
71cf9d1d12 Make phone number in Sim Settings read properly in Talk back mode.
Bug: 24308980
Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e
2015-12-09 20:44:06 -08:00
Geoff Mendal
33d226a747 Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
am: 74e9c3d348  -s ours

* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
  Import translations. DO NOT MERGE
2015-11-20 01:19:51 +00:00
Geoff Mendal
74e9c3d348 Import translations. DO NOT MERGE am: 2102350ea3 -s ours
am: 75dd183bf7  -s ours

* commit '75dd183bf7b99c995fe773e7b53a6604a6b53512':
  Import translations. DO NOT MERGE
2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7 Import translations. DO NOT MERGE
am: 2102350ea3  -s ours

* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
  Import translations. DO NOT MERGE
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
549379737d Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
am: ebc5086d15

* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
  Block developer settings during SUW
2015-11-17 20:40:50 +00:00
Russell Brenner
4868199d28 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c
am: bcf3b75f57

* commit 'bcf3b75f5732cc270d1974edd2cf1ed48863cb31':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:40:38 +00:00
Russell Brenner
ebc5086d15 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039
am: f0d538f08d

* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
  Block developer settings during SUW
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81
am: 8199c3028c

* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
am: 2b29501039

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93
am: 38e932dc81

* commit '38e932dc816fe7aff6443bfa5648743f527aa097':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e
am: 5950ff1d69

* commit '5950ff1d69ca27c09569f40862201ede261c831e':
  Block developer settings during SUW
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours
am: 439033dd93

* commit '439033dd93417b98acff392865166503a507ff30':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69 Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
am: 6967df6421  -s ours

* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421 [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b Merge "Block developer settings during SUW" into lmp-mr1-dev
am: 56d630a3ed

* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
  Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1 [DO NOT MERGE] Preserve FRP lock if wiped during SUW
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
7285e2c2fc Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb
am: 6a7ff3186b

* commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:47:46 +00:00
Russell Brenner
6a7ff3186b Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6
am: 7d44fe6fdb

* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
am: 2075d98be6

* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00
Sanket Padawe
5df69b5307 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 am: 773b8a3c44
am: 60461f3410

* commit '60461f3410151716d34d87ae1ca4ad00620b72eb':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:28:09 +00:00
Russell Brenner
2075d98be6 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am: f0ff1631de

* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:22:41 +00:00
Sanket Padawe
60461f3410 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2
am: 773b8a3c44

* commit '773b8a3c4422ab9daf7adb62895568852b43882e':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:22:25 +00:00
Sanket Padawe
773b8a3c44 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
am: 28eca8e8c2

* commit '28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de Merge "Preserve FRP lock if wiped during SUW" into mnc-dev 2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed Merge "Block developer settings during SUW" into lmp-mr1-dev 2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2 Uncheck checkbox for contact sharing by default for non carkit devices.
am: 98f11fd1a4

* commit '98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:12:09 +00:00
Russell Brenner
14bf226c79 [DO NOT MERGE] Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:08:51 +00:00
Robin Lee
3ed65b90d0 Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
am: 905829393d

* commit '905829393d85db3e5d3f4b18a37c5da7184e6a63':
  VPN settings: grey out policy-restricted menus
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d Merge "VPN settings: grey out policy-restricted menus"
am: ee4808d37b

* commit 'ee4808d37b955299501e9b753cc7bb19877d4f83':
  VPN settings: grey out policy-restricted menus
2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b Merge "VPN settings: grey out policy-restricted menus" 2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2 VPN settings: grey out policy-restricted menus
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.

Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
2015-11-13 14:01:43 +00:00
Sanket Padawe
f20ba4b797 Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee
am: df5b8c5b65

* commit 'df5b8c5b65050f08c36c1610d856282ab05fae5f':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:07:06 +00:00
Sanket Padawe
df5b8c5b65 Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262
am: 0ad16831ee

* commit '0ad16831ee2e2029a0fc2891c8007505bb9779cd':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:02:30 +00:00
Sanket Padawe
0ad16831ee Uncheck checkbox for contact sharing by default for non carkit devices.
am: dbc47fb262

* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-12 23:57:48 +00:00