Commit Graph

69581 Commits

Author SHA1 Message Date
Erik Kline
d9bfb83d96 Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1
am: 0d1f04384f

Change-Id: I8c0d0037bace2b9a3992e78dc0f853b92a8e0484
2017-04-20 04:47:16 +00:00
Hugo Benichi
7bbd03be36 Merge "ConnectivityManager: unify prety printing of callback types." am: 0a4dc6a5d2
am: 3a0e92fada

Change-Id: Ie639f2c9685f19ef00ddb4ac937e6e9576998b80
2017-04-20 04:40:34 +00:00
Erik Kline
fe86a197a1 Merge "Make tetherChangePermission to be secured for AppOps permission" 2017-04-20 04:28:53 +00:00
Hugo Benichi
a038568676 ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).

Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-20 10:42:38 +09:00
Jakub Pawlowski
f3732e2fe2 Merge "Expose LE advertiser address for easier PTS tests (1/6)" am: f2e6988350
am: fc99848b96

Change-Id: Ie3ded1b0237b56bb4c81ad7a51c50b82267bc536
2017-04-19 21:44:50 +00:00
Jakub Pawlowski
4bc4a44100 Expose LE advertiser address for easier PTS tests (1/6)
This patchset adds a hidden method getOwnAddress, that lets app with
BLUETOOTH_PRIVILEGED permission to lear their own addreess. This is done
exclusively for PTS tests.

Bug: 35147497
Test: manual
Change-Id: Iaf0f2fe0613de44b8430ac25e691d66a4ad44f8d
2017-04-19 21:32:57 +00:00
Jakub Pawlowski
8359e191ae Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
am: 0c9c0969cc

Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
2017-04-19 16:13:50 +00:00
Tetsutoki Shiozawa
335d2edee2 Make tetherChangePermission to be secured for AppOps permission
Symptom:
AppOps verified the incorrect package of calling tether state
changing API.
It threw SecurityException by mistake.

Solution:
Pass the correct package name to enforceTetherChangePermission.

Bug: 32931147
Change-Id: Ia1167f26f556678b189a24a4a716f1a7e5cb12eb
2017-04-19 16:50:33 +09:00
nharold
6eab2ee093 Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf
am: 8508bc52d2

Change-Id: I114e0175d72cdbabf47ed230b2971b57a6c210f1
2017-04-18 22:02:48 +00:00
Nathan Harold
7883c5d460 Consistenly Throw IOExceptions from IpSecManager am: 0bfb207532
am: 5db180bbb7

Change-Id: I85ec1413eff50887853f13fa02dcc461071fb210
2017-04-18 22:01:32 +00:00
Jakub Pawlowski
de74891d1c Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.

Bug: 35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
2017-04-18 20:47:03 +00:00
Nathan Harold
da18b028f8 Hide Socket+DatagramSocket IpSecTransform methods
These methods do not currently work for IPv4 sockets,
so they need to be hidden until the underlying kernel
code can be made to work properly in a dual-stack
environment.

Bug: 36073210
Test: compilation
Change-Id: Idce367f638a42da374a7f1dc5ebb8931c9555e06
2017-04-17 19:41:08 -07:00
Nathan Harold
0bfb207532 Consistenly Throw IOExceptions from IpSecManager
Bug: 36073210
Test: api-update
Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
2017-04-17 17:57:41 -07:00
Yifan Hong
ee93d9da20 Merge changes from topic 'vintf_check_compat_native' am: 6d033475b3
am: 4fccec4f81

Change-Id: Ib2691dd7d9b35d20ac71b50a090392e736b51bf7
2017-04-17 18:35:52 +00:00
Yifan Hong
6d033475b3 Merge changes from topic 'vintf_check_compat_native'
* changes:
  Update for removing mount arg to VintfObject::CheckCompatibility
  Add Java API for libvintf.
2017-04-17 18:12:30 +00:00
Hugo Benichi
e505b37ec5 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2
am: 4d80366762

Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
2017-04-14 15:29:09 +00:00
Treehugger Robot
1a8f04b1b2 Merge "ConnectivityManager: release all requests mapping to a callback." 2017-04-14 15:10:10 +00:00
Hugo Benichi
dafed3d008 ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
  - callback recycling: releasing then reregistering a callback again.
  - multiple request registrations with the same callback.

The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.

In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
  - request to callback unmapping is done synchronously at callback
    release time.
  - all requests associated to a callback are unmapped at callback
    release time.

This fixes the following issues:
  - a callback stops being triggered as soon as it is released.
    Otherwise when recycling the callback immediately, it is possible
    the previous request associated with it triggers it, confusing the
    app.
  - when a callback is registered multiple times, the requests are not
    leaked.
  - when a callback is registered multiple times and then released, the
    N-1 first registrations do not trigger the callback anymore.

In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.

Bug: 35921499, 35955593, 20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
      recycling, and a disabled test for no multiple regristration.
      - new tests catch regression causing b/35921499, b/35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
2017-04-14 22:17:21 +09:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
2017-04-14 07:00:41 +00:00
Yifan Hong
4e01db8c12 Add Java API for libvintf.
android.os.VintfObject has two methods:

- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
          compatible.

Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Bug: 36814503

Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
2017-04-13 18:04:30 -07:00
Hugo Benichi
eef918a66c 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.

(not like commit 0908daaaf0, this patch
uses a comma to separate fallback urls, which works as expected with
Java's String.split())

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: I3c010bfee5b99db03a500776fbf47959a29d0578
2017-04-14 08:19:39 +09:00
Dave Friedman
27aeab9763 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d
am: f125662db1

Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
2017-04-13 17:28:34 +00:00
Dave Friedman
f125662db1 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb
am: 2d642f9e2d

Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
2017-04-13 17:19:36 +00:00
Dave Friedman
2d642f9e2d Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb
am: 4eff74f8cb

Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee
2017-04-13 17:06:11 +00:00
Dave Friedman
4eff74f8cb Docs: Fixes broken link in Javadoc. am: df0fd34d50
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
2017-04-13 17:00:44 +00:00
Dave Friedman
506a8b39fb Docs: Fixes broken link in Javadoc.
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
2017-04-13 16:48:41 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
2017-04-13 13:46:32 +00:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf0.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
2017-04-13 12:43:49 +00:00
Hugo Benichi
b98eee1f78 Merge changes Ia15f77e2,Icaa1f95c am: c923752929
am: 8e5ebd9261

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
2017-04-13 09:40:19 +00: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
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
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
a9acf9db97 Merge "Bluetooth 5 PHY simplification" 2017-04-12 21:22:29 +00: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
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
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
Nathan Harold
b64993559b Add FileDescriptor Versions of applyTransportModeTransform()
Because there is no way using the Java sockets API to actually
get a socket of AF_INET on mode machines, it is necessary to
provide a way to apply transforms to sockets made using the
native wrapper API, which uses POSIX APIs and will create a
socket that is AF_INET.

Bug: 36073210
Test: b/34811227
Change-Id: I28ac7cc4f36045ce523a54111e5be975b0331356
2017-04-11 10:14:11 -07:00
Nathan Harold
6045429b35 IpSecManager and IpSecAlgorithm API Tweaks
-Add a reserveSecurityParamterIndex() function that allows the
 system to select an SPI.
-Disallow INVALID_SECURITY_PARAMETER_INDEX from being passed as
 an explicit SPI request.
-Remove the ALGO_ prefix from constants in IpSecAlgorithm

Bug: 36073210
Test: Updated CTS tests still pass on bullhead
Change-Id: Ic94809996076b0718f153f550b82192fe7048a2e
2017-04-11 10:14:10 -07:00
Mark Salyzyn
8143fa57ad jni: isLoggable: adapt to removal of property name size limit
There is no longer a name size limit to the properties, remove
illegalArgumentException if tag length is too large.

Test: build
Bug: 36696208
Change-Id: I4b4329c8c951082ed0d777cdd70ee3e773bed16c
2017-04-11 07:31:40 -07:00
Jakub Pawlowski
6b1228a556 Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1
am: 131cc43a2c

Change-Id: I7b12ecaaeb83bb3e5d49cd44d99c3339e2c0c835
2017-04-11 06:36:13 +00:00
Jakub Pawlowski
e6c453d828 Remove enable from PeriodicAdvertisingPariameters (1/2)
Instead of setting enable to true, one can just pass null
PeriodicAdvertisingParameters and achieve same result when starting the
set.
Passing the "enable" when updating the parameters make no sense, and
might be confusing.
Experience with "timeout" field, which was a part of AdvertiseSettings
show that merging fields that go into different HCI commands can cause
problems during processing, so keep enable as separate field.

Test: manual
Bug: 30622771
Change-Id: Ida02c59eb8433537179b4d22202fe745f8b4bb3e
2017-04-11 06:18:44 +00:00
Jack He
25c086b7e2 Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd
am: d86c1fca76

Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
2017-04-10 23:11:15 +00:00
Dave Friedman
df0fd34d50 Docs: Fixes broken link in Javadoc.
Bug: 37198106
Change-Id: If005bf563f7bd97f794261e03d46c7b092955a89
2017-04-10 14:50:24 -07:00
Jack He
e86bdcaed1 Add developer setting and system API for inband ringing support
* Add 1 system API to check inband ringing flag in config.xml
	static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature

Bug: 19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
2017-04-10 19:49:36 +00:00
Lorenzo Colitti
edb6946bd1 Merge "Add an API hint for metered multipath traffic." am: 7a12f7efc7
am: 0ad718aab1

Change-Id: I787a9722c210632539a9258e8320f88153daba55
2017-04-10 05:54:10 +00:00
Treehugger Robot
7a12f7efc7 Merge "Add an API hint for metered multipath traffic." 2017-04-10 05:40:10 +00:00