284459 Commits

Author SHA1 Message Date
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
Michael Plass
37a1d983fe Merge "Remove implementation of bssid hotlist"
am: 62c5f64fa5

Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
2017-03-29 23:57:32 +00:00
Colin Cross
15d1878206 Update layoutlib to match java library changes
javalib.jar is now only used for jars that contain dex files, so
host java libraries are now always called classes.jar.  Update
layoutlib's custom rules to match.  Also remove built_ext_data,
the classes.jar in built_ext_classes already contains the
resources.

Test: layoutlib-tests
Change-Id: I522d9e3786ad7deeb291c7c1a61ec4b86be03dc2
2017-03-29 16:52:16 -07:00
Treehugger Robot
62c5f64fa5 Merge "Remove implementation of bssid hotlist" 2017-03-29 23:50:03 +00:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Robert Sesek
06f3930677 In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE.
When creating an isolatedProcess=true service and when the native bridge
is in use, MountEmulatedStorage() is called with force_mount_namespace=true
and MOUNT_EXTERNAL_NONE. This led to an abort crash, since the process
would attempt to mount an empty path string.

Test: android.externalservice.cts.ExternalServiceTest built for ARM, run on Fugu
Bug: 36072260
Change-Id: I9441bcbd30167971ad486726bbeae57f3c4aebe9
2017-03-29 19:03:14 -04: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
Michael Plass
31225c466e Remove implementation of bssid hotlist
Test: Relevant unit tests pass
Bug: 30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
2017-03-29 14:19:50 -07:00
Koji Fukui
19e2bcd2a7 Merge "Ignore toast request of pinning if request interval is too short"
am: 1fcacf7736

Change-Id: I2814c128db0f9eb42d1f35236ed57e35ad6c417c
2017-03-29 18:49:47 +00:00
Treehugger Robot
1fcacf7736 Merge "Ignore toast request of pinning if request interval is too short" 2017-03-29 18:41:54 +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
Etan Cohen
9bc8e05da2 Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am: 5d81b9d67d

Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
2017-03-29 17:08:51 +00:00
Etan Cohen
5d81b9d67d Merge "[AWARE] Remove Publish/Subscribe Count configuration" 2017-03-29 17:03:42 +00:00
Jakub Pawlowski
e7f89b07e6 Bluetooth: fix comment wording
Test: manual
Bug: 30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
2017-03-29 16:34:07 +00:00
Etan Cohen
c24d7f781a Merge "[AWARE] Fix unit tests"
am: de8e09409b

Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
2017-03-29 15:04:28 +00:00
Etan Cohen
de8e09409b Merge "[AWARE] Fix unit tests" 2017-03-29 14:56:42 +00:00
Koji Fukui
d8c160351c Ignore toast request of pinning if request interval is too short
Symptom:
System crash happens if an application repeatedly requests to finish
itself in pinning state.

Root cause:
Toast for pinning state is shown when the application requests to
finish itself. Every toasts use file descripters and they consumes all
available file descripters. System crash happens because of file
descriptor shortage.

Solution:
Ignore toast request for pinning state if request interval is too short.

Bug: 34211454

Change-Id: I4c3b45825270ab96fcfb24723195e9189709c2ec
2017-03-29 13:05:31 +09: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
mukesh agrawal
28882ed5d5 utiltests: add script to run tests
Make it easier to run the tests, so that more people
will run them.

Bug: 36698401
Test: tests/utiltests/runtests.sh \
      -e class com.android.internal.util.StateMachineTest

Change-Id: I3151fb6b2f609f45c7d8154b51f13cce58ccdc13
2017-03-28 18:21:35 -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
c480bdafdb Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files

Bug: 32871170
Bug: 26719109

(cherry picked from commit a70b1b120365976f5eeb7cb3f577f5f6ff7ad18e)

Merged-In: Iaee8071449c83e774b2fe331aaccfc5433856f4f
Change-Id: I2334e4d73a5acdd1106e913c59ddf642782f1eee
2017-03-28 16:00:25 -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 f5a7bfc8d5f9e74d6fa1e5be3246e7b4cde65bf6)

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
Brad Ebinger
70a09c00e5 Merge "Remove non-localized message"
am: ddbd256954

Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
2017-03-28 22:35:36 +00:00
Brad Ebinger
ddbd256954 Merge "Remove non-localized message" 2017-03-28 22:21:54 +00:00
Andreas Gampe
9f6dc54c29 Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
am: cbcb388d82

Change-Id: I5c293bcfb026f75c15fb2fa92b2ac7f796579747
2017-03-28 20:38:59 +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 37dfc8ee3ec676a0f059a9f9f1ec5d273e78a502)

Merged-In: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
Change-Id: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6

# Conflicts:
#	core/java/android/app/LoadedApk.java
2017-03-28 13:37:15 -07:00
Calin Juravle
37fb57084b Set pm.BackgroundDexOptService as the source of true
The real dexopt maintainance job is
com.android.server.pm.BackgroundDexOptService, and not
com.android.server.BackgroundDexOptJobService

Partial revert of commit 096d304ae3d85c1bfcda1a1d9cd4eb13d0815500.

Test: manual inspection
Bug: 36140426

(partial cherry picked from commit
91d40f1baa2eeed2aa68d2492e20650d5e71dab5)

Merged-In: I983ac91117f107282095fa7eefdbce08e0dcfce3
Change-Id: I983ac91117f107282095fa7eefdbce08e0dcfce3

# Conflicts:
#	core/res/AndroidManifest.xml
#
services/core/java/com/android/server/pm/PackageManagerService.java
#	services/java/com/android/server/SystemServer.java
2017-03-28 13:37:15 -07:00
Calin Juravle
b3e74b2f90 Add missing return in DexManager
Harmless issue but which can spam the logs.

Test: mostly manual since the check is buried deep inside and cannot be
verified accurately. I added another test to DexManager to stress that
code path and then checked the logs.

Bug: 36117123

(cherry picked from commit 2dfc1b3e125860221bc67835c2d5c99198a12f8a)

Merged-In: I1a878a200f3f726dfaa85f1bed1398acc8dce979
Change-Id: Ib2c034add2e8229b90eb4aaa0067d42d26798670
2017-03-28 13:37:15 -07:00
Calin Juravle
24ff75fb08 Update package use info when the app data is updated
- clear usesByOtherApps flag when the package is updated
- delete secondary dex usage data when the app data is destroyed

Test: runtest -x .../PackageDexUsageTests.java
      runtest -x .../DexManagerTests.java
Bug: 32871170
Bug: 35381405

(cherry picked from commit 99dd37b3c5262910150ef955d16a33d32da264dd)

Merged-In: I3a249b9e8680e745fa678c7ce61b4ae764078fb9
Change-Id: Ia8416e7232cda3e42a8dccd51cb152a237e0f317
2017-03-28 13:37:15 -07:00
Treehugger Robot
cbcb388d82 Merge "ActivityManager: Allow DiskRead for wrap.sh determination" 2017-03-28 20:28:30 +00: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
Jerry Zhang
cb6beee2af Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
am: a0360e38ab

Change-Id: I862f38f52cef8b2b90125953593774263b862306
2017-03-28 18:57:16 +00:00