OSDN Git Service
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug:
37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
Treehugger Robot [Fri, 21 Apr 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
Erik Kline [Fri, 21 Apr 2017 08:59:30 +0000 (08:59 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
Erik Kline [Thu, 20 Apr 2017 13:59:16 +0000 (22:59 +0900)]
Clarify IControlsTethering LOCAL_ONLY state name
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I1f45511f00aca37480f894be4a9a004f1a3b35d7
Hugo Benichi [Fri, 21 Apr 2017 01:58:14 +0000 (01:58 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
Treehugger Robot [Fri, 21 Apr 2017 01:16:31 +0000 (01:16 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
Yang Ni [Thu, 20 Apr 2017 22:37:20 +0000 (22:37 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
Treehugger Robot [Thu, 20 Apr 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Convert libinputservice to Android.bp"
Jordan Liu [Thu, 20 Apr 2017 17:11:57 +0000 (10:11 -0700)]
Use SubscriptionId instead of SubId
Update the api to use SubscriptionId instead of SubId.
Fixes:
35766624
Test: Existing unit tests pass
Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Merged-In: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Treehugger Robot [Thu, 20 Apr 2017 16:39:36 +0000 (16:39 +0000)]
Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off"
Treehugger Robot [Thu, 20 Apr 2017 15:37:29 +0000 (15:37 +0000)]
Merge "Switch to WifiManager.{start,stop}SoftAp()"
Wenting Xiong [Tue, 7 Feb 2017 11:12:27 +0000 (19:12 +0800)]
DO NOT MERGE. SystemUI: Display RAT icon when data is off
Introduce customization and implementation to display RAT icon in status
bar even when data is off. Since some carriers require, this feature is
necessary.
Test: Test with simulated RIL
Bug:
28805511
Change-Id: I412a407b8bcfeb9b3caf265bc7e0331a88433725
Treehugger Robot [Thu, 20 Apr 2017 12:47:53 +0000 (12:47 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast"
Hugo Benichi [Thu, 20 Apr 2017 12:38:27 +0000 (12:38 +0000)]
Merge "ConnectivityManager: remove obsolete callback types"
Erik Kline [Mon, 17 Apr 2017 07:47:23 +0000 (16:47 +0900)]
Add local-only hotspot info into tether state change broadcast
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
Erik Kline [Thu, 20 Apr 2017 04:28:52 +0000 (04:28 +0000)]
Merge "Make tetherChangePermission to be secured for AppOps permission"
Hugo Benichi [Thu, 20 Apr 2017 04:28:43 +0000 (04:28 +0000)]
Merge "ConnectivityManager: unify prety printing of callback types."
Colin Cross [Thu, 20 Apr 2017 00:00:07 +0000 (17:00 -0700)]
Convert libinputservice to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
Merged-In: I3cd2bb05ec89c40ebd1240e352a19f99d00dc114
(cherry picked from commit
3fc8f2df3098a5bb8191cca43b4dc4cf3bba160b)
Eugene Susla [Fri, 24 Feb 2017 02:24:39 +0000 (18:24 -0800)]
Add BitUtils (from "Support multiple filters per association request")
This patch is a cherry-pick of the BitUtils class from commit
36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e.
(cherry picked from commit
36e866b8e0ec08e45b5e7fbc65aeeb3a9bb7b11e)
Test: none
Change-Id: Iaf33929f6841db273a92d650e84287bf2964fa3d
Merged-In: I0a978787551a1ee5750ec5544b241d3bbfed5a7c
Hugo Benichi [Thu, 23 Mar 2017 13:40:44 +0000 (22:40 +0900)]
ConnectivityManager: remove obsolete callback types
This patch also:
- suppresses callback triggers from ConnectivityService for these
obsolete callback types.
- marginally refactors callCallbackForRequest().
Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
Hugo Benichi [Wed, 22 Mar 2017 08:07:57 +0000 (17:07 +0900)]
ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
Jakub Pawlowski [Wed, 19 Apr 2017 21:33:43 +0000 (21:33 +0000)]
Merge "Expose LE advertiser address for easier PTS tests (1/6)"
Jakub Pawlowski [Wed, 19 Apr 2017 13:52:08 +0000 (06:52 -0700)]
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
Meng Wang [Wed, 19 Apr 2017 18:00:50 +0000 (11:00 -0700)]
Fix error message: getAllowedCarriers
Test: make
Change-Id: I0ee74f34f31742f2bf979dd9158ed22d56d64e5e
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."
Tetsutoki Shiozawa [Wed, 16 Mar 2016 14:30:57 +0000 (23:30 +0900)]
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
Treehugger Robot [Wed, 19 Apr 2017 06:08:48 +0000 (06:08 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.
As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I73823ca575560cbd445d78a6cfbfc72031943265
(cherry-picked from commit
16d4843433e024100b4ecd183f827ad5bd8772a6)
Change-Id: I943bf8234899e1b25d4eb5e98af15d9150a7a842
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
Yang Ni [Tue, 18 Apr 2017 21:04:55 +0000 (14:04 -0700)]
Validates Intrinsic Blur only takes 2D Allocations
Bug:
24555166
Test: RSTest on x86_64 emulator
Change-Id: I0c8c970ce85989c3213fb4986e517ac0be5beb26
Jakub Pawlowski [Fri, 14 Apr 2017 14:21:20 +0000 (07:21 -0700)]
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
Jaewan Kim [Fri, 3 Feb 2017 07:21:38 +0000 (16:21 +0900)]
Add callback for AVRCP 1.6 support
Bug:
33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
nharold [Tue, 18 Apr 2017 18:35:20 +0000 (18:35 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
* changes:
Hide Socket+DatagramSocket IpSecTransform methods
Consistenly Throw IOExceptions from IpSecManager
Treehugger Robot [Tue, 18 Apr 2017 08:39:40 +0000 (08:39 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
Lorenzo Colitti [Tue, 18 Apr 2017 08:22:51 +0000 (08:22 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
Erik Kline [Tue, 18 Apr 2017 05:22:25 +0000 (14:22 +0900)]
Switch to WifiManager.{start,stop}SoftAp()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: I730d029128a14b936c111ae159b9708d935f4656
Nathan Harold [Tue, 18 Apr 2017 02:34:33 +0000 (19:34 -0700)]
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
Nathan Harold [Tue, 18 Apr 2017 00:11:58 +0000 (17:11 -0700)]
Consistenly Throw IOExceptions from IpSecManager
Bug:
36073210
Test: api-update
Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
Yifan Hong [Mon, 17 Apr 2017 18:12:27 +0000 (18:12 +0000)]
Merge changes from topic 'vintf_check_compat_native'
* changes:
Update for removing mount arg to VintfObject::CheckCompatibility
Add Java API for libvintf.
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"
Erik Kline [Thu, 13 Apr 2017 13:54:34 +0000 (22:54 +0900)]
Flatten the transitions to tethering and hotspot.
The previous version could trigger a Log.wtf() if an error occured within
ServingState.enter() that caused a transition while a tranistion was
already in flight.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: I66a47caf22e39ab4ad7f4ddd60940e9fe1580729
Yifan Hong [Fri, 14 Apr 2017 22:39:20 +0000 (15:39 -0700)]
Update for removing mount arg to VintfObject::CheckCompatibility
It is default to false.
Test: pass
Bug:
36814503
Change-Id: Ib06850d3355f54996b17cc6c2980a7d17af132e5
Treehugger Robot [Sat, 15 Apr 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Expose phone account register/unregister intents."
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Treehugger Robot [Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
Jordan Liu [Wed, 1 Mar 2017 02:15:07 +0000 (18:15 -0800)]
Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.
Test: flashed onto device locally
Bug:
33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Nathan Harold [Fri, 14 Apr 2017 20:13:11 +0000 (13:13 -0700)]
Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE
Bug:
35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
Hall Liu [Fri, 14 Apr 2017 18:30:25 +0000 (18:30 +0000)]
Merge "Helper method in VideoCallImpl for testing"
Treehugger Robot [Fri, 14 Apr 2017 18:03:11 +0000 (18:03 +0000)]
Merge "Add PID info into ANR crash log header"
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
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
Treehugger Robot [Fri, 14 Apr 2017 06:41:07 +0000 (06:41 +0000)]
Merge "Captive portal: rotate fallback urls"
Rebecca Silberstein [Fri, 14 Apr 2017 04:03:48 +0000 (04:03 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
Yifan Hong [Wed, 5 Apr 2017 21:42:05 +0000 (14:42 -0700)]
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
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
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
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b, 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
Hugo Benichi [Thu, 13 Apr 2017 13:25:40 +0000 (13:25 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
Treehugger Robot [Thu, 13 Apr 2017 13:25:10 +0000 (13:25 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
Hugo Benichi [Thu, 13 Apr 2017 12:43:49 +0000 (12:43 +0000)]
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
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.
Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
Treehugger Robot [Thu, 13 Apr 2017 09:24:32 +0000 (09:24 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
* changes:
Captive portal: regroup hardcoded http response codes.
Captive portal: rotate fallback urls
Treehugger Robot [Thu, 13 Apr 2017 08:19:05 +0000 (08:19 +0000)]
Merge "Extract SimChangeListener to its own file"
Hugo Benichi [Mon, 10 Apr 2017 08:08:06 +0000 (17:08 +0900)]
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
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
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
Rebecca Silberstein [Thu, 23 Mar 2017 22:05:39 +0000 (15:05 -0700)]
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
Rebecca Silberstein [Sun, 26 Mar 2017 00:19:38 +0000 (17:19 -0700)]
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
Treehugger Robot [Thu, 13 Apr 2017 05:49:31 +0000 (05:49 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
Lorenzo Colitti [Thu, 13 Apr 2017 05:18:46 +0000 (05:18 +0000)]
Merge "Move some NetworkStats tests to tests/net."
Erik Kline [Fri, 7 Apr 2017 06:29:29 +0000 (15:29 +0900)]
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
Lorenzo Colitti [Wed, 12 Apr 2017 22:27:35 +0000 (22:27 +0000)]
Merge changes from topic 'network_specifier'
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Jakub Pawlowski [Wed, 12 Apr 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Bluetooth 5 PHY simplification"
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Brad Ebinger [Mon, 20 Mar 2017 20:16:28 +0000 (13:16 -0700)]
Helper method in VideoCallImpl for testing
Test: Telecom Unit Tests
Change-Id: Ie619850bd6a0a0bb599dc6d69c43757604723ee0
nharold [Wed, 12 Apr 2017 18:13:55 +0000 (18:13 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Jakub Pawlowski [Wed, 12 Apr 2017 15:51:22 +0000 (08:51 -0700)]
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
Lorenzo Colitti [Wed, 12 Apr 2017 16:18:05 +0000 (01:18 +0900)]
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
Robert Greenwalt [Wed, 12 Apr 2017 15:15:32 +0000 (15:15 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes"
Orion Hodson [Wed, 12 Apr 2017 13:00:18 +0000 (14:00 +0100)]
Unhide MethodHandles.explicitCastArguments()
Bug:
33192564
Test: m -j32
Change-Id: Ic80c9fa8bd81173220f4a1615e35d89b0ed621c2
Treehugger Robot [Wed, 12 Apr 2017 09:38:40 +0000 (09:38 +0000)]
Merge "Captive portal: fix probe urls at network creation"
Erik Kline [Fri, 20 Jan 2017 11:26:10 +0000 (20:26 +0900)]
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
Treehugger Robot [Tue, 11 Apr 2017 23:59:28 +0000 (23:59 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
Mark Salyzyn [Tue, 11 Apr 2017 23:13:06 +0000 (23:13 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit"
shuoq [Tue, 10 Jan 2017 21:14:02 +0000 (13:14 -0800)]
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
Amit Mahajan [Tue, 11 Apr 2017 21:25:41 +0000 (21:25 +0000)]
Merge "Add p2 option in openLogicalChannel."
Mathieu Chartier [Tue, 11 Apr 2017 01:28:03 +0000 (18:28 -0700)]
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
Nathan Harold [Fri, 7 Apr 2017 00:46:00 +0000 (17:46 -0700)]
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
Nathan Harold [Fri, 7 Apr 2017 01:16:28 +0000 (18:16 -0700)]
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
Treehugger Robot [Tue, 11 Apr 2017 16:19:14 +0000 (16:19 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
Andreas Gampe [Tue, 11 Apr 2017 15:22:13 +0000 (15:22 +0000)]
Merge "OtaDexOptService: Log post-reboot moves"
Dan Willemsen [Fri, 7 Apr 2017 22:48:45 +0000 (15:48 -0700)]
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
Mark Salyzyn [Fri, 7 Apr 2017 18:26:26 +0000 (11:26 -0700)]
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
Jakub Pawlowski [Tue, 11 Apr 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
Jakub Pawlowski [Mon, 10 Apr 2017 20:45:16 +0000 (13:45 -0700)]
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
Hugo Benichi [Mon, 10 Apr 2017 13:45:13 +0000 (22:45 +0900)]
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
nharold [Mon, 10 Apr 2017 22:49:59 +0000 (22:49 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()"