284459 Commits

Author SHA1 Message Date
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
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
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
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
Shuo Qian
40cde7b71f Merge "ECBM SystemProperty cleanup"
am: 4718606368

Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
2017-04-12 21:00:50 +00:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00: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
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
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
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
5f98be7f11 Merge "jni: isLoggable: adapt to removal of property name size limit"
am: cf39eea407

Change-Id: I225add287a014fa8e2623d1e61456a5c523d5377
2017-04-11 23:25:06 +00:00
Mark Salyzyn
cf39eea407 Merge "jni: isLoggable: adapt to removal of property name size limit" 2017-04-11 23:13:08 +00:00
shuoq
d199113e97 ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Test: manual
Bug: 30361624

Change-Id: I355d69820b157f23e077a95a13f8509ee0fa5874
2017-04-11 14:59:29 -07:00
Amit Mahajan
7c6fa75512 Merge "Add p2 option in openLogicalChannel."
am: f954f2d5cc

Change-Id: I3437793f39ba6747554fec383ac7ab9f88df9266
2017-04-11 21:34:51 +00:00
Amit Mahajan
f954f2d5cc Merge "Add p2 option in openLogicalChannel." 2017-04-11 21:25:43 +00:00
Mathieu Chartier
1886a155f2 Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING
dalvik-data-code-cache and dalvik-CompilerMetadata should be counted
in JITCache instead of .GC in dumpsys.

Bug: 37224159
Test: adb shell dumpsys meminfo -d

(cherry picked from commit 874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b)

Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051
2017-04-11 13:52:53 -07: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
Dan Willemsen
73def9c0f9 Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am: 4a43598bd6

Change-Id: Ib66ddf53cbe91d2064f6268f9115cd577883acae
2017-04-11 16:54:57 +00:00
Treehugger Robot
4a43598bd6 Merge "Remove .(ll)ndk suffix from (ll)ndk_library" 2017-04-11 16:19:16 +00:00
Andreas Gampe
4e04b5882f Merge "OtaDexOptService: Log post-reboot moves"
am: ac293515b3

Change-Id: I76ded23a21610405079f275a61e1b61c23b46de7
2017-04-11 15:32:27 +00:00
Andreas Gampe
ac293515b3 Merge "OtaDexOptService: Log post-reboot moves" 2017-04-11 15:22:14 +00:00
Dan Willemsen
68686dbb41 Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
2017-04-11 15:15:02 +00: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
131cc43a2c Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
am: 763765b1b1

Change-Id: Idb0c93f1f37b3fc4bd44bc4ad7d5474fd46e7413
2017-04-11 06:30:23 +00:00
Jakub Pawlowski
763765b1b1 Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" 2017-04-11 06:18:56 +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
Hugo Benichi
b03272c9b5 Captive portal: fix probe urls at network creation
This patch changes how url configuration values for captive portal
detection are read: instead of re-reading the settings at every probe
detection, the settings are read once when the NetworkMonitor associated
to a network is created.

If the settings are updated, the new values are picked up by new
networks, but not by existing networks. Since captive portal detection
is most important when joining WiFi networks, the newest available
settings values will still be used.

This change prepares introducing further changes for rotating probe
urls. Especially it helps making the detection strategy stateful with
respect to the lifecycle of a single NetworkMonitor.

Test: built, flashed, tested manually with various portal networks
Bug: 36532213
Change-Id: I71cc8bb8b996462f27f50798d67bceee5ffb898d
2017-04-11 13:23:38 +09:00
nharold
a51173943a Merge "Deprecate TelephonyManager.getCellLocation()"
am: bc0f610b25

Change-Id: Ic6f55f3f00b608f3b8c3212b0dea1114250ec1fe
2017-04-10 23:10:01 +00:00
Jack He
d86c1fca76 Merge "Add developer setting and system API for inband ringing support"
am: 1da38b2bcd

Change-Id: I24f6eccb3a3dcc37fd21ee48d8844bd5a1b112f0
2017-04-10 22:59:56 +00:00
nharold
bc0f610b25 Merge "Deprecate TelephonyManager.getCellLocation()" 2017-04-10 22:50:01 +00:00
Andreas Gampe
95349c0e96 OtaDexOptService: Log post-reboot moves
Disable artifact checks for non-upgrade booting. Log the number of
successfully move artifacts.

Bug: 37158297
Test: m
Test: manual
Change-Id: Ic81531950582ce937e2e3b7815fb9132888d9a42
2017-04-10 15:48:50 -07:00
Jack He
1da38b2bcd Merge "Add developer setting and system API for inband ringing support" 2017-04-10 22:47:56 +00:00
Tyler Gunn
1fb1c39838 Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
am: c4ea961f91

Change-Id: I77e7353fe345fbf17f9499aea9e792a23e8725d4
2017-04-10 21:58:08 +00:00
Treehugger Robot
c4ea961f91 Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." 2017-04-10 21:49:06 +00:00
Tyler Gunn
b6ce026fd1 Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.

Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
2017-04-10 13:29:21 -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
Erik Kline
908ce167eb Merge "Tethering: support Local-only Hotspot mode for downstreams"
am: d3128d4b55

Change-Id: Ic7d5e3e23f9ccc0f094ba5991e2fdefa82865b01
2017-04-10 12:02:49 +00:00