OSDN Git Service
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb
am:
aa4d6f1be9
Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am:
34ed84d4eb
Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366
am:
0e7882f2ac
Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am:
691ebe5366
Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.
Bug:
33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad
am:
301c714b43
Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am:
d00478e9ad
Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.
Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from
e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15
am:
e0707f139d
Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am:
d8384b5c15
Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"
Etan Cohen [Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am:
dfe8f5dc13
am:
2a4e3bef2c
Change-Id: I6f894d92451032657678639c3021eef07289a6a2
Etan Cohen [Wed, 11 Jan 2017 23:12:16 +0000 (23:12 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am:
dfe8f5dc13
Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
Etan Cohen [Wed, 11 Jan 2017 22:59:24 +0000 (22:59 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Jeremy Joslin [Wed, 11 Jan 2017 19:59:27 +0000 (19:59 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am:
b5488ec3b3
am:
425a0fdc95
Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
Jeremy Joslin [Wed, 11 Jan 2017 19:52:37 +0000 (19:52 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
am:
b5488ec3b3
Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c
Treehugger Robot [Wed, 11 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
Etan Cohen [Tue, 10 Jan 2017 05:47:32 +0000 (21:47 -0800)]
[AWARE] Unhide Wi-Fi Aware API (baseline)
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).
Bug:
30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
Shijian Li [Wed, 11 Jan 2017 17:32:12 +0000 (17:32 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package
name when starting the activity now.
Bug:
34216066
Change-Id: Ic8c8576ce2c65bc554bbf4794e169838c2ccbbe1
Akira Oshimi [Wed, 11 Jan 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am:
e3677865a8
am:
49b68ad0cd
Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d
Akira Oshimi [Wed, 11 Jan 2017 16:01:23 +0000 (16:01 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
am:
e3677865a8
Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9
Treehugger Robot [Wed, 11 Jan 2017 15:51:36 +0000 (15:51 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
Mark Salyzyn [Wed, 11 Jan 2017 15:40:24 +0000 (15:40 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am:
e7fcbcb991
am:
6143cbf1e5
Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
Mark Salyzyn [Wed, 11 Jan 2017 15:35:19 +0000 (15:35 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am:
e7fcbcb991
Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
Mark Salyzyn [Wed, 11 Jan 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
Neil Fuller [Wed, 11 Jan 2017 15:02:42 +0000 (15:02 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code" am:
216303cdb6
am:
5be9960f66
Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd
Lenka Trochtova [Wed, 11 Jan 2017 14:59:18 +0000 (14:59 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
0c1a4b6a97
am:
345362c66f
Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6
Neil Fuller [Wed, 11 Jan 2017 14:54:51 +0000 (14:54 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"
am:
216303cdb6
Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55
Lenka Trochtova [Wed, 11 Jan 2017 14:49:09 +0000 (14:49 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am:
0c1a4b6a97
Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2
Neil Fuller [Wed, 11 Jan 2017 14:46:46 +0000 (14:46 +0000)]
Merge "Switch ConfigUpdater to the new version of timezone updater code"
Treehugger Robot [Wed, 11 Jan 2017 14:40:05 +0000 (14:40 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
Neil Fuller [Wed, 11 Jan 2017 13:48:14 +0000 (13:48 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am:
649a89e524
am:
f4e236c794
Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
Neil Fuller [Wed, 11 Jan 2017 13:37:37 +0000 (13:37 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
am:
649a89e524
Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd
Neil Fuller [Wed, 11 Jan 2017 13:27:09 +0000 (13:27 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
Martijn Coenen [Wed, 11 Jan 2017 11:35:56 +0000 (12:35 +0100)]
Use new read(Embedded)Buffer APIs.
Bug:
34134129
Test: mma, hidl_test_java
Change-Id: I13b3841778d5df4e7c37760610712a26c68896d6
Richard Uhler [Wed, 11 Jan 2017 10:48:00 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
8582826f8d
am:
5c5637e1bd
Change-Id: I27f00cca9b511d6950e12b59f179faae21f07147
Richard Uhler [Wed, 11 Jan 2017 10:37:33 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am:
8582826f8d
Change-Id: If5d55f55d86c4e4711e36a7f517336fbdda96e3d
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Richard Uhler [Thu, 8 Dec 2016 10:33:09 +0000 (10:33 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug:
33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859
Erik Kline [Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am:
f84e5e8f76
am:
d48902d37e
Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc
Erik Kline [Wed, 11 Jan 2017 08:38:00 +0000 (08:38 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
am:
f84e5e8f76
Change-Id: I4e4d525ff1dc23189e4ef6978a1980319d6b85f2
Erik Kline [Wed, 11 Jan 2017 08:29:17 +0000 (08:29 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction"
Erik Kline [Tue, 10 Jan 2017 08:37:54 +0000 (17:37 +0900)]
Prepare UpstreamNetworkMonitor for extraction
Test: as follows:
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- tested basic wifi-to-mobile tethering (no DUN)
Bug:
32163131
Change-Id: Id0b2497f231af5e79ae3bbf42c73bc78031b6fa3
Akira Oshimi [Fri, 16 Dec 2016 09:57:28 +0000 (18:57 +0900)]
Fix clipping for edit screen of Quick Settings
The width of the edit screen is fixed when the display size is updated
in landscape mode. So when the device is rotated to portrait mode, the
width is not updated and the edit screen is truncated.
To fix this issue, "match_parent" should be used to match to the width
of Notification Panel always.
Bug:
34206618
Test: manual - go to Settings, rotate device to landscape mode, change
display size (Default > Large > Default), rotate device
to portrait mode and show QS edit screen
Change-Id: I35ac623812908a61cd34357e6bda567cab55ace1
Andreas Gampe [Wed, 11 Jan 2017 02:46:57 +0000 (02:46 +0000)]
Merge "Zygote: Add fdsToIgnore" am:
5b22a826d5
am:
140b9b65a1
Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3
Calin Juravle [Wed, 11 Jan 2017 02:44:08 +0000 (02:44 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am:
619d6282c3
am:
6d0b836562
Change-Id: I22594f44c2487a7b0933de9c298389f9a6688549
Calin Juravle [Wed, 11 Jan 2017 02:43:15 +0000 (02:43 +0000)]
Add an extra debug flag to BackgroundDexOptimizer am:
3a2b7f7d59
am:
236477e86e
Change-Id: I30686bda79e0400d6aaca8ee71ca0c449452ed31
Calin Juravle [Wed, 11 Jan 2017 02:42:21 +0000 (02:42 +0000)]
Some refactoring in BackgroundDexOptService. am:
95176bb18e
am:
377cc26e3a
Change-Id: If18489475e12e1d5c641f512a6b21f0ba70c6b6a
Calin Juravle [Wed, 11 Jan 2017 02:41:28 +0000 (02:41 +0000)]
Do not try to resolve realpath in DexManager. am:
b96dba9bad
am:
b8f31d8a85
Change-Id: I4b9e9c0781a4db89a49d588bcebb953c6144f5a3
Calin Juravle [Wed, 11 Jan 2017 02:40:14 +0000 (02:40 +0000)]
Log DexManager realpath errors only in debug mode. am:
271bacbf5c
am:
42c7fc7f27
Change-Id: I68f14e9a0b7507a93a9569e670b3693958fd7c09
Calin Juravle [Wed, 11 Jan 2017 02:39:00 +0000 (02:39 +0000)]
Record data about dex files use on disk am:
5a9094c1b6
am:
dc10a3bdb0
Change-Id: Ife1e626d722ba129cdcb6cd4a8f454cf28ca267c
Calin Juravle [Wed, 11 Jan 2017 02:38:01 +0000 (02:38 +0000)]
Add logic for recording dex files use on disk am:
6ea5ace7b3
am:
34bdf1680a
Change-Id: I075e6c5224b374f2d03d711e4d5492d60e4da572
Andreas Gampe [Wed, 11 Jan 2017 02:33:05 +0000 (02:33 +0000)]
Merge "Zygote: Add fdsToIgnore"
am:
5b22a826d5
Change-Id: I458e354acf620cb434de41790ce94b814ff0a4ea
Calin Juravle [Wed, 11 Jan 2017 02:28:11 +0000 (02:28 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
am:
619d6282c3
Change-Id: I7f13f7a7557288f2b5cc515b424161c946241d5a
Calin Juravle [Wed, 11 Jan 2017 02:28:08 +0000 (02:28 +0000)]
Add an extra debug flag to BackgroundDexOptimizer
am:
3a2b7f7d59
Change-Id: I309923c247bef67ffbdba56955582f6decde3800
Calin Juravle [Wed, 11 Jan 2017 02:27:25 +0000 (02:27 +0000)]
Some refactoring in BackgroundDexOptService.
am:
95176bb18e
Change-Id: I191aeed8a7264bb13c4cef8b1ba135fd03a75d58
Calin Juravle [Wed, 11 Jan 2017 02:26:36 +0000 (02:26 +0000)]
Do not try to resolve realpath in DexManager.
am:
b96dba9bad
Change-Id: I67aba48784bca9a51f63e47b54c211ba535dd0e4
Calin Juravle [Wed, 11 Jan 2017 02:25:05 +0000 (02:25 +0000)]
Log DexManager realpath errors only in debug mode.
am:
271bacbf5c
Change-Id: I94aca4959284912e6d5008f56617254be2fc3ea7
Stephen Chen [Wed, 11 Jan 2017 02:24:26 +0000 (02:24 +0000)]
Merge "Delete old WifiNotificationController strings." am:
6daef4499f
am:
f412290e94
Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda
Calin Juravle [Wed, 11 Jan 2017 02:24:14 +0000 (02:24 +0000)]
Record data about dex files use on disk
am:
5a9094c1b6
Change-Id: I50378b1351a5ae83ac55f1b26e2e0c5f3230c6d2
Calin Juravle [Wed, 11 Jan 2017 02:23:29 +0000 (02:23 +0000)]
Add logic for recording dex files use on disk
am:
6ea5ace7b3
Change-Id: I82246efd8e78c1c4ac18a67f0274b10545605207
Treehugger Robot [Wed, 11 Jan 2017 02:20:36 +0000 (02:20 +0000)]
Merge "Zygote: Add fdsToIgnore"
Stephen Chen [Wed, 11 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "Delete old WifiNotificationController strings."
am:
6daef4499f
Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee
Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
* changes:
Add an extra debug flag to BackgroundDexOptimizer
Some refactoring in BackgroundDexOptService.
Do not try to resolve realpath in DexManager.
Log DexManager realpath errors only in debug mode.
Record data about dex files use on disk
Add logic for recording dex files use on disk
Treehugger Robot [Wed, 11 Jan 2017 02:12:48 +0000 (02:12 +0000)]
Merge "Delete old WifiNotificationController strings."
Jeremy Joslin [Wed, 11 Jan 2017 01:45:43 +0000 (01:45 +0000)]
Merge "Moved isCallerActiveScorer() to the score service." am:
663b444196
am:
5fbd2791ac
Change-Id: If5649294845f01a390bccd47fe99add3b27b0829
Jeremy Joslin [Wed, 11 Jan 2017 01:41:14 +0000 (01:41 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
am:
663b444196
Change-Id: I44134284edc88567703435ce663b3d0efd9cff26
Treehugger Robot [Wed, 11 Jan 2017 01:30:02 +0000 (01:30 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
Hugo Benichi [Wed, 11 Jan 2017 01:29:11 +0000 (01:29 +0000)]
Merge changes I559eb049,I52425b84 am:
60d10ea0f4
am:
575726487f
Change-Id: I0b218cc9a6820380b8e32ea0e020d39929a42826
Hugo Benichi [Wed, 11 Jan 2017 01:27:40 +0000 (01:27 +0000)]
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am:
2c02197bdd -s ours
am:
2a913049ab -s ours
Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31
Hugo Benichi [Wed, 11 Jan 2017 01:26:47 +0000 (01:26 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am:
7f086e162b -s ours
am:
7520a07036 -s ours
Change-Id: If035aa5fb1783bfc180c928969f08d89b5dd19f0
Hugo Benichi [Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)]
Merge changes I1eaab5ea,I42928da8 am:
b1e3c8aaf4
am:
22e7d2ed20
Change-Id: I6b0a8e3c2831933199c8cb55ce8c666e8db186e3
Hugo Benichi [Wed, 11 Jan 2017 01:23:51 +0000 (01:23 +0000)]
DO NOT MERGE Captive portal systel log improvements am:
b32417a772 -s ours
am:
6352f85398 -s ours
Change-Id: If06761b413cda9d3f79aa79e8ae60cf0ce306946
Hugo Benichi [Wed, 11 Jan 2017 01:22:35 +0000 (01:22 +0000)]
DO NOT MERGE Fix flaky IpPrefixTest. am:
f6b180ff1a -s ours
am:
68ec108b6e -s ours
Change-Id: Ic492f64b8fc44dc9a8ca1abd539fe757c703acac
John Reck [Wed, 11 Jan 2017 01:21:30 +0000 (01:21 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
95ef9ec5b1
am:
44e14d0d2b
Change-Id: I5e5243c75f446d46bb81252583cfa46e47d60309
Hugo Benichi [Wed, 11 Jan 2017 01:18:07 +0000 (01:18 +0000)]
Merge changes I559eb049,I52425b84
am:
60d10ea0f4
Change-Id: Ided0ebc7e0aaab0f88c2b0af7e3e99fa9e674a60
Hugo Benichi [Wed, 11 Jan 2017 01:18:00 +0000 (01:18 +0000)]
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
am:
2c02197bdd -s ours
Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce
Hugo Benichi [Wed, 11 Jan 2017 01:17:16 +0000 (01:17 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am:
7f086e162b -s ours
Change-Id: Id2f32089145a13a199838d8c004504fee1c7c011
Hugo Benichi [Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)]
Merge changes I1eaab5ea,I42928da8
am:
b1e3c8aaf4
Change-Id: I744394de40b72744ac60f3d6c2a138c6e876ee28
Hugo Benichi [Wed, 11 Jan 2017 01:14:04 +0000 (01:14 +0000)]
DO NOT MERGE Captive portal systel log improvements
am:
b32417a772 -s ours
Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24
Hugo Benichi [Wed, 11 Jan 2017 01:12:54 +0000 (01:12 +0000)]
DO NOT MERGE Fix flaky IpPrefixTest.
am:
f6b180ff1a -s ours
Change-Id: I929a0ef7a6a044d2263a04867c2701653c3634de
John Reck [Wed, 11 Jan 2017 01:11:59 +0000 (01:11 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am:
95ef9ec5b1
Change-Id: I0b088bc47b1311ace1000cc700fd81d56eec4b7f
Treehugger Robot [Wed, 11 Jan 2017 01:06:56 +0000 (01:06 +0000)]
Merge changes I559eb049,I52425b84
* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Treehugger Robot [Wed, 11 Jan 2017 01:02:05 +0000 (01:02 +0000)]
Merge changes I1eaab5ea,I42928da8
* changes:
DO NOT MERGE Captive portal systel log improvements
DO NOT MERGE Fix flaky IpPrefixTest.
John Reck [Wed, 11 Jan 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Andreas Gampe [Thu, 5 Jan 2017 20:45:58 +0000 (12:45 -0800)]
Zygote: Add fdsToIgnore
Add file descriptors that should be ignored in the file descriptor
table check.
Use this to ignore the pipe file descriptors when starting an app
with invoke-with (wrapper).
Bug:
32607405
Test: m
Test: Device boots
Test: Apps start
Test: adb root && adb shell setprop wrap.com.android.calculator2 logwrapper && adb shell am start -S -n com.android.calculator2/.Calculator
Change-Id: I4a30dfc9382d3172cc815bd41b17a123799354f6
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Add an extra debug flag to BackgroundDexOptimizer
This makes testing/debugging the job a bit easier.
Test: device boots, packages get compiled
Bug:
32871170
(cherry picked from commit
a50d58e22630cd651a815381639e70476991bdbf)
Change-Id: I5b94a8f0b3bbf9075dcaecf028aaf79a21aaab7b
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Some refactoring in BackgroundDexOptService.
Extract postOta/idle optimizations in their own method.
In preparation for adding the logic to handle secondary dex files.
Test: device boots, pacakges get compiled
Bug:
32871170
(cherry picked from commit
be6a71a0b3f369843a26c91dd5123d0499f00e7e)
Change-Id: Ie6cdd8461e7214f5de68bc9172f4171ebf72aa39
Calin Juravle [Thu, 22 Dec 2016 16:47:05 +0000 (18:47 +0200)]
Do not try to resolve realpath in DexManager.
PM should already provide the real path of the application directory.
Test: runtest -x .../DexManagerTests.java
Bug:
33807524
Bug:
32871170
(cherry picked from commit
c066205cea051c6d9f386188b9cb426c03dbee2d)
Change-Id: Ie6b5f5e61d08710e7ef7d3149b7b13cc7d03a242
Calin Juravle [Thu, 22 Dec 2016 14:31:19 +0000 (14:31 +0000)]
Log DexManager realpath errors only in debug mode.
Test: runtest -x .../DexManagerTests.java
Bug:
33807524
(cherry picked from commit
bb9ed1f3c93f0267fa97d6cbeb58ecd1de41d795)
Change-Id: Ib962edf67ce7f5b9b93c9bc6855675e00e025810
Calin Juravle [Fri, 16 Dec 2016 16:22:00 +0000 (16:22 +0000)]
Record data about dex files use on disk
Add DexManager to keep track of how dex files are used.
Every time a dex file is loaded, PackageManager will notify DexManager
which will process the load. The DexManager will look up what package
owns the dex file and record its use in package-dex-usage.list (through
PackageDexUsage).
Test: device boots, package-dex-usage.list is created and contains valid data, after device reboot the list is succesfully read from disk.
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
Bug:
32871170
(cherry picked from commit
b8976d8f22fecaa9ed39276d9d8ded17d35b51a6)
Change-Id: I9d779b2d39814d7c54fc7a888df93d403a001df5
Calin Juravle [Thu, 1 Dec 2016 17:53:07 +0000 (17:53 +0000)]
Add logic for recording dex files use on disk
Add PackageDexUsage to handle the I/O operations of dex usage data. It
is responsible to encode, save and load dex
Test: runtest -x .../PackageDexUsageTests.java
Bug:
32871170
(cherry picked from commit
0318162abcbd07a0472989df43e00e353fac731b)
Change-Id: I6d483d480d62aa14cb1663560fd88092469a2835
Jeremy Joslin [Tue, 10 Jan 2017 21:08:32 +0000 (13:08 -0800)]
Move getActiveScorerPackage() to the score service.
Implemented getActiveScorerPackage() in the NetworkScoreService to
make it more efficient (no need to query PM).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33781558
Change-Id: Iee7610e4982b44aefa1ef8b6c208292b8f9adcf8
Merged-In: I2144351c2c09cad30f80399069364f3572e38445
Jeremy Joslin [Tue, 10 Jan 2017 00:22:20 +0000 (16:22 -0800)]
Moved isCallerActiveScorer() to the score service.
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e
Jordan Liu [Tue, 10 Jan 2017 23:44:43 +0000 (23:44 +0000)]
Merge "Fix naming of key" am:
0b74a1dabb
am:
c68c2f6885
Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
Robert Sesek [Tue, 10 Jan 2017 23:41:13 +0000 (23:41 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am:
98d86fe2b7
am:
c6d9f0fbce
Change-Id: I0010cbf45a5e9fc10f86dbfbda510d34ba4b7429
OSDN Git Service
