285085 Commits

Author SHA1 Message Date
Hugo Benichi
a415870221 Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.

This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.

Test: built, flashed, tested manually with various portal networks
Bug: 36532213

Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
2017-04-13 16:45:47 +09:00
Hugo Benichi
0908daaaf0 Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
2017-04-13 16:45:44 +09:00
Rebecca Silberstein
52b665eba0 WifiManager: add new methods to start softap
Add two new methods to start/stop softap in WifiService.  These are
internal calls that allow WifiService and ConnectivityService to
coordinate the switch to and from softap mode.  These calls will not be
callable by apps and are protected by the NETWORK_STACK permission.  The
calls are added in this CL, but are not used at this time.

Bug: 36540346
Test: compiles

Change-Id: Idabdba7f779cbac999ff88d8993b2f4b1f4a1624
2017-04-13 00:43:19 -07:00
Rebecca Silberstein
84b3139de5 Add a default SSID prefix for local only hotspot
Add a default prefix for local only hotspot that will be used to
generate WifiConfiguration objects.  This prefix will have
random digits appended to reduce AP name collisions.

Bug: 36704909
Test: compiles

Change-Id: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
2017-04-13 00:43:18 -07:00
Erik Kline
1d3528ba86 Merge "Ignore potential SystemProperties errors when setting net.dns" am: f854c9034c
am: 1303b8b9ca

Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
2017-04-13 06:12:30 +00:00
Erik Kline
1303b8b9ca Merge "Ignore potential SystemProperties errors when setting net.dns"
am: f854c9034c

Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
2017-04-13 06:00:37 +00:00
Treehugger Robot
f854c9034c Merge "Ignore potential SystemProperties errors when setting net.dns" 2017-04-13 05:49:31 +00:00
Lorenzo Colitti
997e6b085a Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b
am: 67401e25c2

Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
2017-04-13 05:37:01 +00:00
Lorenzo Colitti
67401e25c2 Merge "Move some NetworkStats tests to tests/net."
am: ab3901dc8b

Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
2017-04-13 05:29:58 +00:00
Lorenzo Colitti
ab3901dc8b Merge "Move some NetworkStats tests to tests/net." 2017-04-13 05:18:47 +00:00
Erik Kline
4edba01eb4 Ignore potential SystemProperties errors when setting net.dns
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
2017-04-13 13:16:22 +09:00
Lorenzo Colitti
cfd729093f Merge changes from topic 'network_specifier' am: d0f476bdae
am: 362bef45d1

Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
2017-04-12 22:48:55 +00:00
Lorenzo Colitti
362bef45d1 Merge changes from topic 'network_specifier'
am: d0f476bdae

Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
2017-04-12 22:43:03 +00:00
Lorenzo Colitti
d0f476bdae Merge changes from topic 'network_specifier'
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
2017-04-12 22:27:37 +00:00
Jakub Pawlowski
ce8de6c3f7 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97
am: d43127865b

Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
2017-04-12 21:45:52 +00:00
Jakub Pawlowski
d43127865b Merge "Bluetooth 5 PHY simplification"
am: a9acf9db97

Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
2017-04-12 21:35:25 +00:00
Jakub Pawlowski
a9acf9db97 Merge "Bluetooth 5 PHY simplification" 2017-04-12 21:22:29 +00:00
Svet Ganov
f9197e0180 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16
am: 91ed4d7553

Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
2017-04-12 21:22:08 +00:00
Julius D'souza
f72b1104f3 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886
am: f72dd4142b

Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
2017-04-12 21:20:50 +00:00
Svet Ganov
91ed4d7553 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am: 39c3d2cf16

Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
2017-04-12 21:11:57 +00:00
Julius D'souza
f72dd4142b DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am: 0a8ecc6886

Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
2017-04-12 21:10:49 +00:00
Shuo Qian
36611a0958 Merge "ECBM SystemProperty cleanup" am: 4718606368
am: 40cde7b71f

Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
2017-04-12 21:06:20 +00:00
Shuo Qian
40cde7b71f Merge "ECBM SystemProperty cleanup"
am: 4718606368

Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
2017-04-12 21:00:50 +00:00
TreeHugger Robot
39c3d2cf16 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev 2017-04-12 21:00:25 +00:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00:00
Julius D'souza
0a8ecc6886 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit 8e9ea907448c49f573dd045707e37dd14efdf152)
2017-04-12 12:06:50 -07:00
nharold
a237a34085 Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b
am: 176bfb58c6

Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
2017-04-12 18:39:15 +00:00
Nathan Harold
99c50add4f IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35
am: 9c2428ad4d

Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
2017-04-12 18:37:23 +00:00
Brad Ebinger
9a6890e3ad Helper method in VideoCallImpl for testing
Test: Telecom Unit Tests
Change-Id: Ie619850bd6a0a0bb599dc6d69c43757604723ee0
2017-04-12 11:33:10 -07:00
nharold
176bfb58c6 Merge changes from topic 'ipsec-api-tweaks'
am: fddf677b8b

Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
2017-04-12 18:29:04 +00:00
Nathan Harold
9c2428ad4d IpSecManager and IpSecAlgorithm API Tweaks
am: 6045429b35

Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
2017-04-12 18:27:09 +00:00
nharold
fddf677b8b Merge changes from topic 'ipsec-api-tweaks'
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
2017-04-12 18:13:57 +00:00
Jakub Pawlowski
9e377194e3 Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
2017-04-12 10:57:03 -07:00
Lorenzo Colitti
c86013be93 Move some NetworkStats tests to tests/net.
This groups them together with the rest of the networking unit
tests. It also speeds up compile/test cycles ("runtest -x" of one
file goes from 1m15s to 30s).

Test: runtest frameworks-net passes on internal tree
Change-Id: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd
2017-04-13 02:38:11 +09:00
Svet Ganov
59e8e3d747 [DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.

bug:30150688

Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit 296a60acc3d67cea23bae167dbcb51c0d0d60b23)
2017-04-12 16:23:40 +00:00
Robert Greenwalt
7c1460f388 Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a
am: 03f9a489cb

Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
2017-04-12 15:37:53 +00:00
Robert Greenwalt
03f9a489cb Merge "Adding 20 free short codes for DCB and other purposes"
am: 70fea2df2a

Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c
2017-04-12 15:27:23 +00:00
Robert Greenwalt
70fea2df2a Merge "Adding 20 free short codes for DCB and other purposes" 2017-04-12 15:15:34 +00:00
Orion Hodson
784d3874f6 Unhide MethodHandles.explicitCastArguments()
Bug: 33192564
Test: m -j32
Change-Id: Ic80c9fa8bd81173220f4a1615e35d89b0ed621c2
2017-04-12 14:03:48 +01:00
Hugo Benichi
4c63d86db7 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7
am: 65fa0676bf

Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
2017-04-12 09:55:06 +00:00
Hugo Benichi
65fa0676bf Merge "Captive portal: fix probe urls at network creation"
am: 923ef69ae7

Change-Id: I82eb06ee1f9d69a1a3ccb5208947bdfcdbba6d81
2017-04-12 09:50:05 +00:00
Treehugger Robot
923ef69ae7 Merge "Captive portal: fix probe urls at network creation" 2017-04-12 09:38:41 +00:00
Erik Kline
227648f336 Extract SimChangeListener to its own file
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - runtest -x full/path/to/SimChangeListenerTest.java passes
Bug: 32163131
Change-Id: If90539fe9a5dc07c7c24ed0b70b920d94065a623
2017-04-12 15:57:49 +09:00
Julius D'souza
6717748eff Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3

Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
2017-04-12 02:01:28 +00:00
Julius D'souza
3c6d6f53f3 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am: 9e3c9eeb96

Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
2017-04-12 01:55:57 +00:00
Julius D'souza
9e3c9eeb96 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev 2017-04-12 01:41:42 +00:00
Mathieu Chartier
540bc2d94e Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62
am: f62b12ae31

Change-Id: I002c55618a647e4ab17fff50f89b04df3e492e9e
2017-04-12 00:20:23 +00:00
Mathieu Chartier
f62b12ae31 Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
am: d269f30d62

Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca
2017-04-12 00:09:47 +00:00
Treehugger Robot
d269f30d62 Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" 2017-04-11 23:59:30 +00:00
Mark Salyzyn
3da7584dc4 Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407
am: 5f98be7f11

Change-Id: I4997e6f310c08cd0cf094a04685859b2853f8a05
2017-04-11 23:33:22 +00:00