Commit Graph

75963 Commits

Author SHA1 Message Date
Mika Raento
ae359622a6 Merge "Systrace support for NNAPI"
am: ecb0302ae9

Change-Id: I16dbb15a6139105b7e04761cdbcffff32b8b1706
2018-04-26 11:12:53 -07:00
Mika Raento
6a30ff8326 Systrace support for NNAPI
Change-Id: Ie73d28937eba33e2d90f1447f17fd6d8e5719a65
Bug: 78137932
Test: mm
2018-04-26 09:34:12 +01:00
Pavlin Radoslavov
493dbf789f Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am: 3a1ca762c9

Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
2018-04-19 17:59:36 -07:00
Pavlin Radoslavov
9d36e6babc Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.

Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.

Bug: 73404858
Bug: 73379307
Test: Unit tests (in frameworks/base)
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java

Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
2018-04-19 14:36:18 -07:00
Stanley Tng
478b35a2fd Merge "Clarify API doc for BluetoothGattServer::addService"
am: f493c66f39

Change-Id: If988cc85292426c6694732e2158ad698d740c93d
2018-04-16 19:59:17 -07:00
Stanley Tng
e93a622275 Merge "Cleanup documentation for LE CoC in BluetoothAdapter"
am: 7b25698549

Change-Id: I5e7633c73c7ed7f9257acb4fb891fbaec8202f63
2018-04-16 18:58:21 -07:00
Treehugger Robot
f493c66f39 Merge "Clarify API doc for BluetoothGattServer::addService" 2018-04-17 00:07:38 +00:00
Stanley Tng
dac8e14018 Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug: 77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
2018-04-16 22:33:31 +00:00
Stanley Tng
4b5cf48560 Clarify API doc for BluetoothGattServer::addService
Clarify that the caller has to wait for onServiceAdded callback before
calling BluetoothGattServer::addService again.

Bug: 72717069
Test: Compile
Change-Id: I20b031c724ba64bfd71cf10e58e587f69e4a2555
2018-04-16 13:12:52 -07:00
Hall Liu
5f0cbc215d Merge "Move RTT system setting to Settings.Secure"
am: 9a51f07117

Change-Id: I226e9a91725f7755595c3530162829f8bf61b135
2018-04-16 13:08:16 -07:00
Hall Liu
9a51f07117 Merge "Move RTT system setting to Settings.Secure" 2018-04-16 18:40:28 +00:00
Hall Liu
60fd195a0a Move RTT system setting to Settings.Secure
Bug: 76449217
Test: manual
Change-Id: Id198aab697e9e37c941b0d99255e4c6a0e1f91a9
Merged-In: I85620d5b834aa7e04579212f3fd5cf6c0498b570
2018-04-12 13:39:58 -07:00
Stanley Tng
cb3222d662 Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
am: 0980006a2a

Change-Id: I3aec5bce2861518d79ae80dd32562d83bc0c7ef4
2018-04-12 08:50:35 -07:00
Stanley Tng
0980006a2a Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" 2018-04-12 14:36:12 +00:00
Colin Cross
09d3aef926 Merge changes from topic "hidl-system-api"
am: 88a2b68252

Change-Id: I862274d2d6a258f252370a9ae3843a31c038d684
2018-04-10 10:43:52 -07:00
Steven Moreland
22795d2008 Update HIDL-related documentation.
am: 9efa13f38c

Change-Id: I8a053ee95610272f97f0031936ac3d3fe50766d2
2018-04-10 10:39:10 -07:00
Steven Moreland
35d09a0d29 Add remaining missing HIDL SystemApi methods.
am: ff0a3642e4

Change-Id: Iafa60151da6c8b994911ff077cfcfdf53bc61b81
2018-04-10 10:34:34 -07:00
Steven Moreland
12071e63e8 HIDL: reportSyspropMethod -> enableInstrumentation
am: 9312938842

Change-Id: Ia533c7ad33066b8c20610f8ea5fea6255d778d1b
2018-04-10 10:29:11 -07:00
Steven Moreland
d6b11ec69f Allow HIDL to be used in priv-apps.
am: 4dde8a113b

Change-Id: Ib255c6b6603cdb51fa1c4c5a11d3c1dc8a0c24a9
2018-04-10 10:22:25 -07:00
Colin Cross
88a2b68252 Merge changes from topic "hidl-system-api"
* changes:
  HIDL: add APIs used by subclasses to SystemApi
  Update HIDL-related documentation.
  Add remaining missing HIDL SystemApi methods.
  HIDL: reportSyspropMethod -> enableInstrumentation
  Allow HIDL to be used in priv-apps.
2018-04-10 16:06:28 +00:00
Erik Kline
bfcbe96fd0 Merge "Support bluetooth not using MultinetworkPolicyTracker"
am: ed631bf5aa

Change-Id: I889e58c1e102f6b0cddebed4454f30fad701b025
2018-04-09 01:51:34 -07:00
Erik Kline
8d1fe54be1 Support bluetooth not using MultinetworkPolicyTracker
This required advancing the IpManager to IpClient refactoring
(Bluetooth used IpManager and friends). Most importantly, the
Bluetooth code used WaitForProvisioningCallback, so this is
moved into IpClient proper now. Also: some more renaming
cleanup.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 62476366
Bug: 72663849

Change-Id: I9eee2a9d5c31cdd48a054a7edc3403584efb1864
2018-04-08 23:09:36 -07:00
Hansong Zhang
1ef9b9979b Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)"
am: d61e87ad08

Change-Id: I919f0be242b532207d31cd32511da86ebbbc9fe3
2018-04-06 17:00:59 -07:00
Treehugger Robot
d61e87ad08 Merge "Bluetooth: Add hidden API to get current user of HID Device (1/3)" 2018-04-06 21:54:06 +00:00
Daniel Colascione
7c4bcfc298 Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE"
am: fe79660d1e

Change-Id: I907c8d585bd4fcea3240b27a9c58343daeb4044a
2018-04-06 11:40:13 -07:00
Daniel Colascione
d1520aa11b Clarify doc comment for android.os.Build.VERSION.RELEASE
The RELEASE field has no guaranteed internal structure and developers
should not attempt to parse it.

Test: no code changes
Change-Id: I0ea3ab5ba5dd4cc733feb62725cf7c62c00c857b
2018-04-06 08:36:18 -07:00
Hansong Zhang
29e1c0e494 Merge "Hearing Aid: change get/set active device (3/3)"
am: a23007dd54

Change-Id: I0760912dd11edf7f3db443d663644b0ceb415f0e
2018-04-04 16:50:40 -07:00
Treehugger Robot
a23007dd54 Merge "Hearing Aid: change get/set active device (3/3)" 2018-04-04 21:42:17 +00:00
tiansiming [田思明]
4b38e9587d Merge "Modify isShowing method in Dialog"
am: 46be1f15af

Change-Id: I9d1cd55d51c37571d199ebbb5975f490e0969a92
2018-04-04 12:47:13 -07:00
Benedict Wong
abcf07af81 Merge "Force creation of Socket upon Transform application"
am: 119cf2bc61

Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796
2018-04-04 12:43:36 -07:00
Treehugger Robot
46be1f15af Merge "Modify isShowing method in Dialog" 2018-04-04 18:39:38 +00:00
Benedict Wong
119cf2bc61 Merge "Force creation of Socket upon Transform application" 2018-04-04 17:14:46 +00:00
tiansiming [田思明]
ca1c4d2755 Modify isShowing method in Dialog
The method isShowing in Dialog.java is to judge whether
the dialog is currently showing, but it will return true
when the dialog is hidden.

Bug: 74416088
Test: modify testShow in DialogTest.java (see 639879)
run cts -m CtsAppTestCases -t android.app.cts.DialogTest#testShow

Change-Id: Ibf15e080678f414f8a66ff0841be17a2f9d2d652
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
2018-04-04 10:54:24 +08:00
Benedict Wong
d175a3d3a0 Force creation of Socket upon Transform application
This change forces Socket and DatagramSocket to populate the
SocketImpl, ensuring that the socket file descriptor can be
retrieved when applying Transport mode Transforms

This is done by calling getSoLinger(), triggering a getImpl(), which
triggers setImpl() if needed.

Bug: 77491294
Test: Added tests in IpSecManagerTest, ran on walleye
Change-Id: I40da08b031357710eb794e0f866aec5660c79594
2018-04-03 17:04:55 -07:00
Ruchi Kandoi
a6c7187242 Merge "Add an Executor for the onConnectedListener"
am: 0d1f7933a3

Change-Id: Ie1075238c6339c7964c14ef82f6db2d499ca03a3
2018-04-03 12:17:37 -07:00
Hansong Zhang
347ef4099e Bluetooth: Add hidden API to get current user of HID Device (1/3)
Bug: 69136526
Test: test with apps using HID Device profile
Change-Id: If0e49840257c877c975c2da176a08e613668cbc3
2018-04-03 12:12:53 -07:00
Stanley Tng
148dd5bf86 Add min_ce/max_ce parameters to requestLeConnectionUpdate()
Add new test parameters, min_ce and max_ce, to the SL4A tests for LE
Connection-oriented Channel (CoC) feature. This CL passes these 2
parameters to native stack.

Test: Run cmd: act.py -c $MY_SL4A_CONFIG -tc BleCoc2ConnTest
Bug: 77528723

Change-Id: I9d3d74f671772014209f8114c2d1b8ba606c54d5
2018-04-03 11:36:51 -07:00
Ruchi Kandoi
cf8bc65bca Add an Executor for the onConnectedListener
Test: Run CtsOmapiTestCases
Bug: 76448978
Change-Id: Ieb30b8935961db25bd058e1c41c127fa5a4437ff
2018-04-02 15:09:52 -07:00
Ruchi Kandoi
43056194a5 Merge "Make OMAPI stricter"
am: 998ef794a3

Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78
2018-03-31 01:43:18 +00:00
Ruchi Kandoi
f0082409b5 Make OMAPI stricter
- Channel implements java.nio.Channels.Channel.
- openBasicChannel(aid) and openLogicalChannel(aid) is added back.
- Add finalizers for the classes.
- SecureElementListener -> onConnectedListener

Bug: 76448978
Test: CtsOmapiTestCases
Change-Id: I7f92c4dcb5c08a72d32ac9440872ab853badec1d
2018-03-30 23:08:42 +00:00
Paul Jensen
f6ab9a5f96 Merge "Fix socket leaks in various android.net.Network methods."
am: 34ce11f2bd

Change-Id: I1a59fced1f3bcd19bd48150ca215093dff431619
2018-03-30 22:03:22 +00:00
Paul Jensen
f72f5b30af Fix socket leaks in various android.net.Network methods.
Bug: 72124526
Test: make CtsNetTestCases
Merged-In: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
Merged-In: I23150482d6c2ab2eaa2b37732af68af69320792b
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
(cherry picked from commit 89bb993293)
2018-03-30 12:20:35 -07:00
Lorenzo Colitti
b9cce46ba8 Merge "Mark networks with OEM_PAID always restricted"
am: 8e338f7dae

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
2018-03-30 08:47:25 +00:00
Chalard Jean
3621eb75cb Merge "Clarify documentation for getActiveNetworkInfo and friends"
am: 39d6694208

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
2018-03-30 08:36:58 +00:00
Lorenzo Colitti
62e6b774e3 Merge "Disallow Reserved SPI Allocation"
am: 7fcde83572

Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
2018-03-30 07:39:01 +00:00
Lorenzo Colitti
8e338f7dae Merge "Mark networks with OEM_PAID always restricted" 2018-03-30 07:00:54 +00:00
Pavel Maltsev
4af9107d6c Mark networks with OEM_PAID always restricted
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
2018-03-30 07:00:39 +00:00
Lorenzo Colitti
2749432646 Merge "Require explicitly supplied truncation length"
am: 0dde066ef7

Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
2018-03-30 06:48:22 +00:00
Chalard Jean
39d6694208 Merge "Clarify documentation for getActiveNetworkInfo and friends" 2018-03-30 06:37:22 +00:00
Lorenzo Colitti
a12c8fe218 Merge "Clarify UDP encapsulation socket API"
am: 2891409c93

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
2018-03-30 06:35:22 +00:00