OSDN Git Service
Jakub Pawlowski [Wed, 8 Mar 2017 19:09:43 +0000 (19:09 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
am:
a06a0dfdb7
Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df
Jakub Pawlowski [Wed, 8 Mar 2017 19:02:11 +0000 (19:02 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
Jakub Pawlowski [Wed, 8 Feb 2017 02:05:39 +0000 (18:05 -0800)]
Bluetooth 5 feature check API (1/2)
Bug:
30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit
79d66495c32996a5b532328571bf6ceecca70ca5)
Joachim Sauer [Wed, 8 Mar 2017 17:40:13 +0000 (17:40 +0000)]
Merge "Renaming Czech Republic to Czechia."
am:
33bade08de
Change-Id: Ie76ebb1bd53eb4993f0d01c7d3b5ba7dae9c6504
Joachim Sauer [Wed, 8 Mar 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Renaming Czech Republic to Czechia."
Etan Cohen [Wed, 8 Mar 2017 15:05:18 +0000 (15:05 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)"
am:
769fa0c881
Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5
Paul Duffin [Wed, 8 Mar 2017 14:59:26 +0000 (14:59 +0000)]
Merge "Replace usages of littlemock with mockito"
am:
0a11c83016
Change-Id: I1456ae3d07d396080a817de01796eefc71230981
Etan Cohen [Wed, 8 Mar 2017 14:55:04 +0000 (14:55 +0000)]
Merge "[AWARE] Add data-path security configuration (Passphrase)"
Paul Duffin [Wed, 8 Mar 2017 14:36:16 +0000 (14:36 +0000)]
Merge "Replace usages of littlemock with mockito"
Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]
[AWARE] Add data-path security configuration (Passphrase)
Add API to optionally provide a passphrase to
configure security on a data-path.
Bug:
33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa
Hemant Gupta [Wed, 8 Mar 2017 00:38:14 +0000 (00:38 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
am:
79eb213a98
Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3
Treehugger Robot [Wed, 8 Mar 2017 00:28:30 +0000 (00:28 +0000)]
Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
Hall Liu [Tue, 7 Mar 2017 21:52:52 +0000 (21:52 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
am:
6bb5110f2c
Change-Id: Idfe092393301fb47e6a635eb150103cb928a2696
Hall Liu [Tue, 7 Mar 2017 21:44:42 +0000 (21:44 +0000)]
Merge "Add further Connection-side APIs for RTT (part 2)"
Calin Juravle [Tue, 7 Mar 2017 21:23:03 +0000 (21:23 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
am:
eef66fd0c7
Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee
Calin Juravle [Tue, 7 Mar 2017 21:13:14 +0000 (21:13 +0000)]
Merge "PackageManager: Clean up code related to foreign dex use"
Calin Juravle [Sat, 4 Mar 2017 01:04:55 +0000 (17:04 -0800)]
PackageManager: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
(cherry picked from commit
74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)
Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
Andreas Gampe [Tue, 7 Mar 2017 16:59:12 +0000 (16:59 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
am:
d0f092af84
Change-Id: I69886924b3aca6c050239069c00e166142e2e522
Treehugger Robot [Tue, 7 Mar 2017 16:50:58 +0000 (16:50 +0000)]
Merge "Framework: Ensure image heap string literals for Patterns"
Etan Cohen [Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)]
Merge "[CM] Allow timeout in request network"
am:
8328f27a87
Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
Tobias Thierer [Tue, 7 Mar 2017 16:43:16 +0000 (16:43 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
am:
aa4877e295
Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
Etan Cohen [Tue, 7 Mar 2017 16:40:26 +0000 (16:40 +0000)]
Merge "[CM] Allow timeout in request network"
Tobias Thierer [Tue, 7 Mar 2017 16:35:17 +0000 (16:35 +0000)]
Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
Paul Duffin [Mon, 6 Mar 2017 14:56:06 +0000 (14:56 +0000)]
Replace usages of littlemock with mockito
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.
https://code.google.com/archive/p/littlemock/
This is being done as part of the work to upgrade Mockito.
Bug:
32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
Erik Kline [Tue, 7 Mar 2017 13:33:29 +0000 (13:33 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
am:
75dfc5bd91
Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
Treehugger Robot [Tue, 7 Mar 2017 13:27:09 +0000 (13:27 +0000)]
Merge "request{LinkProperties,NetworkCapabilities} no longer needed"
Erik Kline [Tue, 7 Mar 2017 06:25:32 +0000 (15:25 +0900)]
request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toggling between WiFi and mobile
Bug:
32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
Erik Kline [Tue, 7 Mar 2017 06:31:48 +0000 (06:31 +0000)]
Merge "Handle null NetworkState updates"
am:
ae758b2c7f
Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
Treehugger Robot [Tue, 7 Mar 2017 06:24:16 +0000 (06:24 +0000)]
Merge "Handle null NetworkState updates"
Erik Kline [Tue, 7 Mar 2017 06:00:09 +0000 (06:00 +0000)]
Merge "Always send all available state when calling onAvailable()."
am:
affbb8b6a9
Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
Treehugger Robot [Tue, 7 Mar 2017 05:51:40 +0000 (05:51 +0000)]
Merge "Always send all available state when calling onAvailable()."
Erik Kline [Tue, 7 Mar 2017 04:17:39 +0000 (13:17 +0900)]
Handle null NetworkState updates
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering to WiFi and mobile switching works
Bug:
32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
Erik Kline [Wed, 15 Feb 2017 10:59:17 +0000 (19:59 +0900)]
Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
- NetworkCapabilities
- LinkProperties
- whether the network is currently suspended
Additionally:
- Rename notifyNetworkCallback() to notifyNetworkAvailable()
in order to clarify its real function.
- fix previous copy/paste error in unittest
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- USB tethering with mobile and Wi-Fi upstream toggling
Bug:
32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
Tyler Gunn [Tue, 7 Mar 2017 02:49:54 +0000 (02:49 +0000)]
Merge "API review cleanups/changes."
am:
9324d6513b
Change-Id: Iaeb4bbb5e551bf4206ea2ab4372d1ba0533c4709
Ruchi Kandoi [Tue, 7 Mar 2017 02:46:54 +0000 (02:46 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
am:
7b0d16249c
Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825
Erik Kline [Tue, 7 Mar 2017 02:45:51 +0000 (02:45 +0000)]
Merge "Start of tethering OffloadController"
am:
121006f428
Change-Id: I590569818c7d7ac50dcc61bd7058bd7c5cad4e77
Hemant Gupta [Fri, 3 Feb 2017 11:08:59 +0000 (16:38 +0530)]
Bluetooth: Expose L2CAP API to support OPP 1.2
Add changes to expose L2CAP API to create an insecure L2CAP socket
for supporting OPP 1.2.
Test: Connect with Remote OPP Client supporting OPP 1.2 and verify
that connection and transfer happens over L2CAP. Connect with Remote
OPP Client supporting OPP 1.1 and verify that connection and transfer
happens over RFCOMM.
Bug:
33010988
Change-Id: I21ed672afb4ed5d2355ff0a0f9691af220921c1f
Tyler Gunn [Tue, 7 Mar 2017 01:55:58 +0000 (01:55 +0000)]
Merge "API review cleanups/changes."
Treehugger Robot [Tue, 7 Mar 2017 01:27:17 +0000 (01:27 +0000)]
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
Treehugger Robot [Tue, 7 Mar 2017 01:00:55 +0000 (01:00 +0000)]
Merge "Start of tethering OffloadController"
Hall Liu [Mon, 6 Feb 2017 18:49:48 +0000 (10:49 -0800)]
Add further Connection-side APIs for RTT (part 2)
Add methods and callbacks to facilitate local and remote RTT initiation
and termination in the middle of a call. Adds @hide Connection-side APIs
to communicate with the ConnectionService, as well as plumbing for
RemoteConnections.
Test: manual, through telecom testapps
Merged-In: Ia80604b7dff8586ff222dbccdbe55e91aab02178
Change-Id: Ia80604b7dff8586ff222dbccdbe55e91aab02178
Andre Eisenbach [Tue, 7 Mar 2017 00:37:31 +0000 (00:37 +0000)]
Merge "BluetoothManagerService: continue teardown when BLE apps registered"
am:
ba0992f4c4
Change-Id: Iac58de264ca48184d2ddd0cf4aeb9a3d5719539c
Yang Ni [Tue, 7 Mar 2017 00:36:19 +0000 (00:36 +0000)]
Merge "Removed close guards for Element and Type objects"
am:
97c9b57cec
Change-Id: I28b4149b6a0ace42dff2ca4ce9a1803b0baa4430
Andre Eisenbach [Mon, 6 Mar 2017 21:25:40 +0000 (21:25 +0000)]
Merge "BluetoothManagerService: continue teardown when BLE apps registered"
Martin Brabham [Tue, 28 Feb 2017 00:55:07 +0000 (16:55 -0800)]
BluetoothManagerService: continue teardown when BLE apps registered
When the adapter is toggled off; when there are BLE apps registered, a
request is sent to unregister all of the BLE apps. Upon unregister each app
will call through to this function via a callback. When this gets called if
the ble app count is 0, we can disable everything. I am keeping track of the
flag so that we know explicitly where we are coming from.
Bug:
34707848
Test: Compile
Change-Id: I9a8322a6fa918e7b410770894c257ec9f7d8d1f5
Yang Ni [Mon, 6 Mar 2017 21:25:29 +0000 (21:25 +0000)]
Merge "Removed close guards for Element and Type objects"
Ruchi Kandoi [Fri, 3 Feb 2017 22:01:09 +0000 (14:01 -0800)]
nfc: First chunked NDEF record of TNF doesn't contain the type field
Test: CTS test passes
Bug:
34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Tom Cherry [Mon, 6 Mar 2017 19:57:18 +0000 (19:57 +0000)]
Merge "Check for spurious wake ups"
am:
3a3cd0a27f
Change-Id: Ia445070278f5a80c85b48e06ddf614d462db45af
Tom Cherry [Mon, 6 Mar 2017 19:25:58 +0000 (19:25 +0000)]
Merge "Check for spurious wake ups"
Tyler Gunn [Thu, 2 Mar 2017 17:28:37 +0000 (09:28 -0800)]
API review cleanups/changes.
- Change onCreateIncomingConnectionFailed/onCreateOutgoingConnectionFailed
to accept the connection mgr phone account as the first parameter.
- For the video APIs, pass the target SDK of the caller into along so
that the Telecom permission check can have fallback behavior for older API
versions.
- Add guidance for how UX should be shown in onShowIncomingCallUi API.
API guidance follows how the Dialer app shows its notification and full
screen UX.
Test: Manual, CTS.
Bug:
35767711
Bug:
35767096
Change-Id: Ib343f0eda1a4d067a38c553f33f140b4efcf3e48
Ajay Panicker [Mon, 6 Mar 2017 18:21:33 +0000 (18:21 +0000)]
Merge "Bluetooth: Use content observer for airplane mode"
am:
8871623b8d -s ours
Change-Id: I83e81bd944c36c0f96a213bf57f99e61a7b35404
Treehugger Robot [Mon, 6 Mar 2017 17:59:02 +0000 (17:59 +0000)]
Merge "Bluetooth: Use content observer for airplane mode"
Ajay Panicker [Wed, 22 Feb 2017 20:23:15 +0000 (12:23 -0800)]
Bluetooth: Use content observer for airplane mode
We are making this switch as the airplane mode switch intent is going away.
Fix:
35256299
Test: Toggle Airplane Mode
Change-Id: I3b1e5bbdf689b0db98cfbb0ab377198d34f0ba05
Hugo Benichi [Mon, 6 Mar 2017 12:30:05 +0000 (12:30 +0000)]
Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions b/
35955593, http://b/
35921499."
am:
704520c392
Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def
Hugo Benichi [Mon, 6 Mar 2017 12:20:40 +0000 (12:20 +0000)]
Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions b/
35955593, http://b/
35921499."
Erik Kline [Mon, 6 Mar 2017 05:05:23 +0000 (14:05 +0900)]
Start of tethering OffloadController
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: If8f7df069f37f1b3d440d446ab1b160a52ba9e09
Hugo Benichi [Mon, 6 Mar 2017 06:16:51 +0000 (06:16 +0000)]
Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions b/
35955593, http://b/
35921499.
This reverts commit
faa70976b490116323107166f90fdd944c5bdc77.
Change-Id: I86c07c113f24753be7c977e6d7f570b99391e1b5
Paul Lawrence [Sat, 4 Mar 2017 02:17:43 +0000 (02:17 +0000)]
Merge "Make seccomp honor setenforce"
am:
c337e32bb0
Change-Id: I9d1bfd35f7da304188da2d6aff6b937108ae4680
Treehugger Robot [Sat, 4 Mar 2017 02:08:53 +0000 (02:08 +0000)]
Merge "Make seccomp honor setenforce"
Paul Lawrence [Fri, 3 Mar 2017 21:04:35 +0000 (13:04 -0800)]
Make seccomp honor setenforce
Note: This code is in frameworks, since we might want to have tools
linked against seccomp_policy that continue to enforce seccomp
Bug:
35950093
Test: Builds, Seccomp: 2 is in zygote & zygote64 status
Run setenforce 0 && stop && start
Seccomp: 0 is in zygote & zygote64 status
Change-Id: I797a6c29f58725f84089c570f784125fb99f57ce
Peter Qiu [Fri, 3 Mar 2017 19:10:46 +0000 (19:10 +0000)]
Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
am:
6ac19c0d23
Change-Id: Ia4966b2d8109a85a94f59d7ec57b387a8f6f612e
Treehugger Robot [Fri, 3 Mar 2017 19:02:27 +0000 (19:02 +0000)]
Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
Yang Ni [Fri, 3 Mar 2017 18:00:07 +0000 (10:00 -0800)]
Removed close guards for Element and Type objects
Bug:
28053769
These objects are tiny and unlikely to cause memory issues.
In addition, llvm-rs-cc auto-generated code contains such objects, which are
not visibible to developers and impossible to manually destroy, leaving
distracting warnings in Strict Mode.
Test: RsTest with StrictMode on and CTS tests
Change-Id: Iec68cca4f1259124b9f503a230c1a28b97ede1f3
Andreas Gampe [Fri, 3 Mar 2017 17:38:58 +0000 (09:38 -0800)]
Framework: Ensure image heap string literals for Patterns
Do not use Pattern.toString to construct complex patterns. Instead,
make the string literals explicit so they can be compile-time
allocated, thus ending up as clean memory in the image heap.
Bug:
34956610
Test: m
Test: Device boots
Change-Id: I20d45c31243af00168553c218f75fb0795b55149
Tobias Thierer [Fri, 3 Mar 2017 12:07:59 +0000 (12:07 +0000)]
Merge "Move value for the Build.CUR_DEVELOPMENT constant into libcore"
am:
3e6c189c68
Change-Id: I981b746a28cda09d7a75fa79faeacb2cc58b1fc4
Tobias Thierer [Fri, 3 Mar 2017 12:02:09 +0000 (12:02 +0000)]
Merge "Move value for the Build.CUR_DEVELOPMENT constant into libcore"
Narayan Kamath [Fri, 3 Mar 2017 11:07:19 +0000 (11:07 +0000)]
Merge "fd_utils: switch to libbase logging."
am:
982f42f71c
Change-Id: I22364e3242317761ac27c51c54efb84dd6aee815
Narayan Kamath [Fri, 3 Mar 2017 10:59:23 +0000 (10:59 +0000)]
Merge "fd_utils: switch to libbase logging."
Narayan Kamath [Fri, 3 Mar 2017 10:41:46 +0000 (10:41 +0000)]
Merge "fd_utils: add missing logging for a couple of failure cases."
am:
9dbcff7d73
Change-Id: Iabd49e8f322e926b1b157ff85f1e9e4f66b0f56a
Narayan Kamath [Fri, 3 Mar 2017 10:34:36 +0000 (10:34 +0000)]
Merge "fd_utils: add missing logging for a couple of failure cases."
Calin Juravle [Fri, 3 Mar 2017 03:51:04 +0000 (03:51 +0000)]
Merge changes from topic 'secondary-dex1'
am:
d56d98b860
Change-Id: Ia9c1329584597a6f30aeaa2bd8e8c979705d8eea
Calin Juravle [Fri, 3 Mar 2017 03:42:33 +0000 (03:42 +0000)]
Merge changes from topic 'secondary-dex1'
* changes:
Use DexManager logic to decide if a package is used by other apps
Skip class path checking for secondary dex files
Calin Juravle [Thu, 2 Mar 2017 03:55:35 +0000 (19:55 -0800)]
Use DexManager logic to decide if a package is used by other apps
Stop relying on the file marker recorded by the runtime. We have the
same data available from the DexManager.
The clean up CL to remove the handling of the file markers will follow.
Test: verify that "shared packages" (e.g. gmscore) are not compiled with speed-profile.
Bug:
32871170
(cherry picked from commit
07b6eabe79261267ecd7114790e96e1f6828672a)
Change-Id: I2969b75fa77d38dde0073ef67aa89b1dc91237b5
Merged-In: I6cc5834ac88489e69896cd5fba9ed9968aa7f5a2
Calin Juravle [Wed, 15 Feb 2017 01:53:13 +0000 (17:53 -0800)]
Skip class path checking for secondary dex files
Pass '&' marker to dex2oat classpath when compiling secondary dex files.
This will skip class path checking when loading the oat files.
Test: adb shell cmd package compile -m speed -f --secondary-dex com.google.android.gms
oatdump --header-only --oat-
file=/data/user/0/com.google.android.gms/app_chimera/m/
00000006/oat/arm64/DynamiteModulesC_GmsCore_prodmnc_alldpi_release
check that the class path contains the special '&' marker
Bug:
32871170
(cherry picked from commit
aae35767b6bca6f872c906a0fd38d7adb61217bd)
Change-Id: I7f3c6743e749316ee02e8586a525ad28ae1ef765
Merged-In: If0628aeb4e3f5717604bfc4a87a4b1d438e5fa65
Elliott Hughes [Fri, 3 Mar 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Remove the name length limit for system properties."
am:
c657b769ab
Change-Id: I700b379c0482d7d9609183a39a5c9664746ea5aa
Elliott Hughes [Fri, 3 Mar 2017 00:22:30 +0000 (00:22 +0000)]
Merge "Remove the name length limit for system properties."
Calin Juravle [Fri, 3 Mar 2017 00:13:57 +0000 (00:13 +0000)]
Merge changes from topic 'secondary-dex'
am:
9e88c53337
Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc
Calin Juravle [Fri, 3 Mar 2017 00:12:19 +0000 (00:12 +0000)]
Save package dex usage info after secondary dex reconciliation
am:
61fd6eab46
Change-Id: I90a95645e9d2acf1b2377e165a64b34b1a678295
Calin Juravle [Fri, 3 Mar 2017 00:10:42 +0000 (00:10 +0000)]
Compile secondary dex files during background dexopt job
am:
574994afde
Change-Id: I204983f6221c07467b450ea9e0bf71b6d15926e1
Calin Juravle [Fri, 3 Mar 2017 00:08:50 +0000 (00:08 +0000)]
Add a shell command to force the background dexopt job
am:
f7edab63d9
Change-Id: Ie77bc356a9ff4786c23a06d1267dc7ca5e45a90a
Calin Juravle [Fri, 3 Mar 2017 00:06:59 +0000 (00:06 +0000)]
A bit more refactoring in BackgroundDexOptService
am:
a57ef16375
Change-Id: Ic258b5484eedcc68650b474acb4fa3eae8589c82
Calin Juravle [Fri, 3 Mar 2017 00:05:07 +0000 (00:05 +0000)]
[PM] Clean up logic for secondary dex oat files
am:
e69fba3f7f
Change-Id: I223b27221acf25e628003dde0f63cffe66779753
Calin Juravle [Fri, 3 Mar 2017 00:03:17 +0000 (00:03 +0000)]
Compile secondary dex files in DexManager
am:
7218363a92
Change-Id: I53e7864b097cf9cff702e9185bb1c9091d97fe63
Calin Juravle [Fri, 3 Mar 2017 00:01:03 +0000 (00:01 +0000)]
Notify DexManager about new package installs
am:
fcd672fca3
Change-Id: I63514deebef293d52f7811023b0915cf655514f6
Calin Juravle [Thu, 2 Mar 2017 23:54:22 +0000 (23:54 +0000)]
Merge changes from topic 'secondary-dex'
* changes:
Fix typo in dexopt.secondary system property
Save package dex usage info after secondary dex reconciliation
Compile secondary dex files during background dexopt job
Add a shell command to force the background dexopt job
A bit more refactoring in BackgroundDexOptService
[PM] Clean up logic for secondary dex oat files
Compile secondary dex files in DexManager
Notify DexManager about new package installs
Peter Qiu [Thu, 2 Mar 2017 22:21:27 +0000 (22:21 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods"
am:
603fb2ef56
Change-Id: I6ae4811e97a99c04a423c1390d87a8c21f4ae416
Elliott Hughes [Thu, 2 Mar 2017 02:47:56 +0000 (18:47 -0800)]
Remove the name length limit for system properties.
Bug: http://b/
33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Merged-In: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Treehugger Robot [Thu, 2 Mar 2017 22:11:00 +0000 (22:11 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods"
Calin Juravle [Tue, 7 Feb 2017 19:09:01 +0000 (11:09 -0800)]
Fix typo in dexopt.secondary system property
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
4466c5ad84e4429284b7d5e13ad8a87c924ea7fc)
Change-Id: Ibfe3111198877ed0d758b68be89afb23c4756053
Merged-In: Ic8a14a3fc5c9aa63f6cb376f337b5bf459997325
Calin Juravle [Fri, 27 Jan 2017 02:53:23 +0000 (18:53 -0800)]
Save package dex usage info after secondary dex reconciliation
Bug:
1833991
Test: add a bogus entry to /syste/data/package-dex-usage.list
adb shell cmd package reconcile-secondary-dex-files
com.android.google.gms
wait a bit and check the bogus entry is gone
(cherry picked from commit
b1097411028103b6c88ce325af23d2ff1ec746c8)
Change-Id: I23248b11ea07bceb6527f55bf62618d1b2c3d83d
Merged-In: Ic07126bfb8730933081a5e010e3c357d338786e8
Calin Juravle [Thu, 26 Jan 2017 02:00:05 +0000 (18:00 -0800)]
Compile secondary dex files during background dexopt job
Extend the backgound dexopt job to compile secondary dex files when
"dalvik.vm.deopt.secondary" system property is set to true.
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
51f521c3bf46e6040f36757bc53ea57ddc7be85e)
Change-Id: I220ff4ea26c4eee030ab1a9f4c957a09aa9f2f4c
Merged-In: If3a4b77f785e92c7f2f7869e25ff9b99904f165a
Calin Juravle [Thu, 26 Jan 2017 01:16:08 +0000 (17:16 -0800)]
Add a shell command to force the background dexopt job
Add 'bg-dexopt-job' command to 'adb shell cmd package' which will force
the background dexopt job to run the optimizations immediately.
Note that the command only runs the background optimizer logic. It may
overlap with the actual job but the job scheduler will not be able to
cancel it. It will also run even if the device is not in the idle
maintenance mode.
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
cb5f41ea11b1a6fcd0977a64ee146dde8f537076)
Change-Id: I82c781d46fe16e7b7566a5b5ee91be723a2125cb
Merged-In: I8b0112074220b2e09baf13d842401ee1cf306a89
Calin Juravle [Thu, 26 Jan 2017 01:08:03 +0000 (17:08 -0800)]
A bit more refactoring in BackgroundDexOptService
Extract convenient methods to help with:
- adding a shell command to run the background dexopt job
- extending idleOptimizations to cover secondary dex files
Test: device boots, background job run.
Bug:
32871170
(cherry picked from commit
c660475aafe91269be306c802823cf543005ce36)
Change-Id: I146e4faeea90f2d58144a5dba26ae7f90a36b402
Merged-In: I18fde62a1cb05c030a620722d5f217589beaefb1
Calin Juravle [Wed, 25 Jan 2017 09:05:50 +0000 (01:05 -0800)]
[PM] Clean up logic for secondary dex oat files
Add logic in DexManager to reconcile secondary dex records with the
actual files on disk. If secondary dex files are moved or removed then
DexManager will remove the generated oat files during the call to
reconcileSecondaryOdex() and update its internal state.
Add 'adb shell cmd package reconcile-secondary-dex packageName' which
will force DexManager to sync its data with the actual secondary dex
files.
Test: devices bots
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
adb shell cmd package reconcile-secondary-dex
com.android.google.gms (after artificially/temporarily renaming some
dex files)
Bug:
32871170
(cherry picked from commit
c22c30ed1c05c5c24185dc4d380d1c5026923d46)
Change-Id: Ied9fcbfe367ed3a8250a9ba8d202518b264c64e8
Merged-In: Id2d72dc89995f89cf1ddf79ae4e992afd3f3c127
Calin Juravle [Tue, 17 Jan 2017 03:18:48 +0000 (19:18 -0800)]
Compile secondary dex files in DexManager
Add logic for secondary dex compilation in DexManager. Also, extend the
`cmd package compile` command with '--secondary-dex' option which will
compile all used secondary dex files for the given package.
Test: flash & boot,
cmd package compile --secondary-dex -f -m speed
com.google.android.gms
Bug:
32871170
(cherry picked from commit
c22c30ed1c05c5c24185dc4d380d1c5026923d46)
Change-Id: I3cf26edbfb5e9f3683e608bb2a596e1ab5682bd4
Merged-In: Ia2b95cb70d26c4ead5cb650047641b0881ca84ae
Calin Juravle [Tue, 24 Jan 2017 07:34:25 +0000 (23:34 -0800)]
Notify DexManager about new package installs
This will update the internal cache so that the secondary dex files of
the new package can be found when loaded.
Test: runtest -x .../DexManagerTests.java
Bug:
32871170
(cherry picked from commit
0d4b8f8b0c963d9a1f5cb6aff11a11195a3df225)
Change-Id: I34008f6d262f19e88a346a36b83e4093b4129105
Merged-In: I0cb7158af249feeb01cf578a7544dda978eede9d
Shubham Ajmera [Thu, 2 Mar 2017 17:32:14 +0000 (17:32 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"
am:
b8648ae07a
Change-Id: I86adc3e40c083c999b717384ae38e437a17a9557
Treehugger Robot [Thu, 2 Mar 2017 17:23:45 +0000 (17:23 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"
Narayan Kamath [Thu, 2 Mar 2017 17:04:08 +0000 (17:04 +0000)]
fd_utils: switch to libbase logging.
Test: make, boots
Change-Id: I4976508f489ca15af0484f75a9ef02ed575beff5
Narayan Kamath [Thu, 2 Mar 2017 14:44:45 +0000 (14:44 +0000)]
fd_utils: add missing logging for a couple of failure cases.
Also start using libbase style logging. Other log statements will
be converted in a follow up.
Test: make
Bug:
33579623
Change-Id: I34bb2ccab57e5bdd22aa35be8f8dcb68fdc4e097