Commit Graph

69453 Commits

Author SHA1 Message Date
nharold
f983d89083 Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f
2017-04-02 00:19:44 +00:00
Nathan Harold
5eaf5393a5 IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d
2017-04-02 00:18:42 +00:00
nharold
464dc5c07e Merge changes from topic 'ipsec-transport-impl'
* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup
2017-04-02 00:10:35 +00:00
Jakub Pawlowski
8c5b5b0c4b Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06
2017-04-01 04:42:45 +00:00
Jakub Pawlowski
821523d859 Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a
2017-04-01 04:40:10 +00:00
Jakub Pawlowski
5a355610fe Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
2017-04-01 04:34:40 +00:00
Jakub Pawlowski
f4ed33f5fa Bluetooth LE Advertising minor improvements
This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e
2017-04-01 04:33:24 +00:00
Ajay Panicker
7eaf518b71 Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am: 985fe4cbd2

Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3
2017-04-01 03:28:13 +00:00
Treehugger Robot
985fe4cbd2 Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" 2017-04-01 03:18:46 +00:00
Jakub Pawlowski
21bd8d5f2e Merge "Fix advertise data size estimation"
am: 5b2e9f40b4

Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
2017-04-01 02:13:41 +00:00
Nathan Harold
93962f34ce Add Initial IPsec APIs to IpSecService
-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService

Bug: 33695893
Test: CTS verifies nearly all of these paths
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920
2017-03-31 18:11:27 -07:00
Jakub Pawlowski
72e9e9f815 Fix advertise data size estimation
UUID in service data field can be 2, 4, or 16 bytes long.

Test: manual
Bug: 36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1
2017-03-31 16:52:48 -07:00
Ajay Panicker
c251633ce2 Bluetooth: Add additional BluetoothSocket logging to root cause errors
Bug: 34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968
2017-03-31 21:22:59 +00:00
Nathan Harold
48b566557d IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
 This is essentially a less-safe method overload, and it is both
 unnecessary and difficult to implement: the cross-validation
 between SPI and Transform is actually useful, and the kernel
 requires two different mechanisms to use an unreserved vs a
 reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
 hard to support. API Council has questioned the value of this,
 and they are right: everything points to "remove this". In the
 future, if we find that SPI reservation is overhead, we can
 always add it back.

-Hiding the TunnelMode builder method and application/remove
 methods. These will not land by the time the next API
 stabilizes, so better to hide them now that this is a
 near-certainty. Expectation is to un-hide them in the subsequent
 API bump.

Bug: 36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
2017-03-31 11:21:10 -07:00
Nathan Harold
6d3c10495e Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am: d118826971

Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
2017-03-30 03:39:46 +00:00
Treehugger Robot
d118826971 Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" 2017-03-30 03:33:13 +00:00
Jakub Pawlowski
c06722e788 Merge "Hide periodic scanning"
am: ca7544ea15

Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
2017-03-30 03:26:18 +00:00
Nathan Harold
c4f879925b Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.

Bug: 36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
2017-03-29 17:46:47 -07:00
Jakub Pawlowski
63fad69a19 Hide periodic scanning
Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
2017-03-29 17:11:59 -07:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Treehugger Robot
ce073d70be Merge "Add a Skeleton IpSecService" 2017-03-29 22:50:50 +00:00
Pavlin Radoslavov
25105f6561 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am: 3c7fce3579

Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
2017-03-29 22:47:28 +00:00
Treehugger Robot
3c7fce3579 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 2017-03-29 22:41:15 +00:00
Nathan Harold
1afbef40c6 Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server

Bug: 34811227
Test: Service boots (and dumpsys works), more via b/34811227
Merged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
2017-03-29 11:31:27 -07:00
Mukesh Agrawal
ad2684ca3d Merge changes I5c16c650,I3151fb6b
am: 55efea25f3

Change-Id: Ifaaae29780d905ffe9f82645d6d17dad478ba6a9
2017-03-29 18:30:00 +00:00
Jakub Pawlowski
eeedda1453 Merge "Bluetooth: fix comment wording"
am: 6ba7c54a51

Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
2017-03-29 18:28:44 +00:00
Tianjie Xu
022682a721 Merge "Report the temperature during an OTA update"
am: 47c7e7f41a

Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
2017-03-29 18:25:11 +00:00
Mukesh Agrawal
55efea25f3 Merge changes I5c16c650,I3151fb6b
* changes:
  StateMachine: make toString() terser
  utiltests: add script to run tests
2017-03-29 18:20:35 +00:00
Treehugger Robot
6ba7c54a51 Merge "Bluetooth: fix comment wording" 2017-03-29 18:20:24 +00:00
Tianjie Xu
47c7e7f41a Merge "Report the temperature during an OTA update" 2017-03-29 18:16:46 +00:00
Pavlin Radoslavov
61075105ca Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
2017-03-29 10:58:48 -07:00
Jakub Pawlowski
e7f89b07e6 Bluetooth: fix comment wording
Test: manual
Bug: 30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
2017-03-29 16:34:07 +00:00
Calin Juravle
8a4afd3dad Merge changes from topic 'dex'
am: f665781c74

Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
2017-03-29 01:27:37 +00:00
mukesh agrawal
47e1c7a005 StateMachine: make toString() terser
The current implementation of the toString()
method calls dump(). This causes two problems:

1. toString() may return a large string. This
   is at odds with the advice in the documentation
   for Object.toString(), which says that the
   returned String should be concise, and easy
   to read.
2. The dump() method is overriden by many of the
   StateMachine subclasses. Some of those subclasses
   have dump() implementations that are expensive,
   and/or have dependencies on other objects.

To resolve these problems, we simpify
StateMachine.toString().

Along the way: remove a stale comment about
implementing dump() using toString().

Note: only ran the StateMachine tests, since some
other tests are already failing.

Bug: 36661851
Test: tests/utiltests/runtests.sh \
      -e class com.android.internal.util.StateMachineTest
Change-Id: I5c16c650f01178c4d018b6a65e4aa95fb905aff6
2017-03-28 18:21:36 -07:00
Calin Juravle
f665781c74 Merge changes from topic 'dex'
* changes:
  Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
  Register secondary dex files for JIT profiling
  Move DexLoadReporter out of LoadedApk
  Set pm.BackgroundDexOptService as the source of true
  Add missing return in DexManager
  Update package use info when the app data is updated
2017-03-29 01:19:58 +00:00
Yifan Hong
75172f2909 Merge "Add HidlSupport.java for utility methods for HIDL."
am: 383391c5da

Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1
2017-03-29 00:39:58 +00:00
Treehugger Robot
383391c5da Merge "Add HidlSupport.java for utility methods for HIDL." 2017-03-29 00:32:19 +00:00
Tianjie Xu
42cfd56d47 Report the temperature during an OTA update
Bug: 32518487
Test: mma
Change-Id: I00494aff91b473ae54eff8d56910198f88083d40
2017-03-28 16:59:16 -07:00
Calin Juravle
a9f46f76af Register secondary dex files for JIT profiling
Test: boot, and check that profiles get recorded for secondary dex files

Bug: 32871170
Bug: 26719109

(cherry picked from commit f5a7bfc8d5)

Merged-In: I2de23ef44eee3f1783ae698821f1c6d88c66c9a6
Change-Id: Id9bbd630b8485dc17eeef846295458df5cfe446a
2017-03-28 16:00:21 -07:00
Yifan Hong
8ef5feadb8 Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.

Bug: 36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
2017-03-28 22:47:32 +00:00
Calin Juravle
d9732c8dbb Move DexLoadReporter out of LoadedApk
The DexLoadReporter was part of LoadedApk in order to lazily initialize
it when the first class loader of the app was created. However there's
no real association between the two and doing the initialization in
LoadedApk buys us nothing.

Extract the reporter in its own class and set it to BaseDexClassLoader
during bindApplication stage.

Test: boot, and check that loaded dex files are reported

Bug: 32871170
Bug: 26719109

(cherry picked from commit 37dfc8ee3e)

Merged-In: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
Change-Id: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6

# Conflicts:
#	core/java/android/app/LoadedApk.java
2017-03-28 13:37:15 -07:00
Jakub Pawlowski
5cca752a4b Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
am: 81cef3aeb8

Change-Id: Ief280cbc9283ff1cabdd3c8e53fcabd47c7881b1
2017-03-28 20:12:46 +00:00
Jakub Pawlowski
81cef3aeb8 Merge "Bluetooth API spelling fixes ("wether" -> "whether")" 2017-03-28 20:01:31 +00:00
Tianjie Xu
1cd3a93288 Merge "improve the format of locale argument when calling recovery"
am: 032c7a0a18

Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307
2017-03-28 19:53:45 +00:00
Tianjie Xu
032c7a0a18 Merge "improve the format of locale argument when calling recovery" 2017-03-28 19:42:54 +00:00
Jakub Pawlowski
08ed924d89 Bluetooth API spelling fixes ("wether" -> "whether")
Bug: 30622771
Test: manual
Change-Id: I01c8b18d0057f2fd6e477ce2ca0b779321b6c0e6
2017-03-28 18:09:50 +00:00
Jakub Pawlowski
cfe099b01d Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
am: beb8ceada8

Change-Id: Ie88e330a1d50adac8c6b83581079c6096c4d898a
2017-03-27 21:22:15 +00:00
Jakub Pawlowski
d7116bea06 Bluetooth GATT callback naming fix "Ext" -> "" (1/2)
Gatt callback don't need the "Ext" postfix, as it was removed from new
API.

Test: manual
Bug: 30622771
Change-Id: I54596ffdcb818343cc313123266cfa16291c6236
2017-03-27 19:27:57 +00:00
Jakub Pawlowski
45487910b4 Merge "Expose connection update callback (4/4)"
am: 60865e4a8d

Change-Id: I0f5301b195b697743d1fb552dac4af8e1fd1445c
2017-03-24 20:36:30 +00:00
Jakub Pawlowski
326f7b31b9 Expose connection update callback (4/4)
Test: manual
Bug: 30622771
Change-Id: I56a3c42814249abc33e95e84ce092c2d8df65434
2017-03-24 17:22:54 +00:00