Leonard Mosescu
eb1501ac3f
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master am: 258790a2ea am: df87eb4adc
...
am: c41f617dec
Change-Id: I09f88b45fd4deea370246dc74465a3db702d8078
2016-10-27 17:50:33 +00:00
Leonard Mosescu
31b7a786a9
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours am: d73688521c am: 8d0cdfb291
...
am: b9b149d9dd
Change-Id: I7335d4314f32a709dfc055964d3a9f3869bd8b7e
2016-10-27 17:49:32 +00:00
Michal Karpinski
4b3c4359c8
Extending DNS event reporting am: 6e54239e50 am: 8c32fd2d33
...
am: 9351835591
Change-Id: Id482e6a300de49cc1d37ec6e38b9c651ec671f3e
2016-10-27 17:48:27 +00:00
TreeHugger Robot
95f7d7a8ec
Merge "Move SkMovie into frameworks/base"
2016-10-27 17:45:16 +00:00
Leonard Mosescu
c41f617dec
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master am: 258790a2ea
...
am: df87eb4adc
Change-Id: Iafeb38ea7de7b233914e2abc8a251061921bf62a
2016-10-27 17:39:59 +00:00
Leonard Mosescu
b9b149d9dd
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours am: d73688521c
...
am: 8d0cdfb291
Change-Id: I18ce0a2d49ab95c89e8318d009112f3c126b58ad
2016-10-27 17:39:07 +00:00
Michal Karpinski
9351835591
Extending DNS event reporting am: 6e54239e50
...
am: 8c32fd2d33
Change-Id: Ia12eb058152589c62e541f6198880f7ce421023c
2016-10-27 17:38:18 +00:00
Leonard Mosescu
df87eb4adc
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master
...
am: 258790a2ea
Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
2016-10-27 17:29:24 +00:00
Leonard Mosescu
8d0cdfb291
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours
...
am: d73688521c
Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
2016-10-27 17:29:19 +00:00
Michal Karpinski
8c32fd2d33
Extending DNS event reporting
...
am: 6e54239e50
Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
2016-10-27 17:28:15 +00:00
Android Build Merger (Role)
258790a2ea
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master
2016-10-27 17:24:56 +00:00
Leonard Mosescu
d73688521c
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
...
am: bd2688f4c3 -s ours
Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
2016-10-27 17:24:17 +00:00
Sunny Goyal
584264f6af
Merge "Adding support for async view loading in RemoteViewsAdapter"
2016-10-27 17:14:47 +00:00
Leonard Mosescu
bd2688f4c3
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
2016-10-27 17:04:57 +00:00
Leonard Mosescu
1ab879be90
Adding "attach-agent" to ActivityManagerShellCommand
...
This new command is used to attach runtime agents to a running application:
attach-agent <PROCESS> <FILE>
Attach an agent to the specified <PROCESS>,
which may be either a process name or a PID.
Test: m test-art-host, manual testing:
. invalid syntax, missing arguments
. invalid syntax, extra arguments
. invalid numeric PID
. invalid process name
. valid process, not debuggable
. valid process, missing agent
. valid process, valid agent
Bug: 31682382
Change-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
2016-10-27 17:03:57 +00:00
Michal Karpinski
6e54239e50
Extending DNS event reporting
...
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
(cherry picked from commit 14c9d2d0df )
2016-10-27 16:39:21 +00:00
Glen Kuhne
f501c31454
Merge "Move wifi.proto to shared service .jar"
2016-10-27 16:28:24 +00:00
Glen Kuhne
8902f81589
Merge "Move ipconnectivity.proto to services-proto.jar"
2016-10-27 16:27:27 +00:00
Philip P. Moltmann
411f8215fc
Merge "Add UsbDeviceConnection.requestWait with a timeout"
2016-10-27 16:15:15 +00:00
Lorenzo Colitti
538f45a8b3
Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a am: 57ee5d7e9c
...
am: 6f605a4e0f
Change-Id: I8013cd6a7abe6f1c40c183c3857972dec0679b63
2016-10-27 15:33:22 +00:00
Michal Karpinski
5f05698a97
Add connect event reporting am: 265494a0f8 am: 17be4d6c85 am: 8fba923d2a
...
am: c1b04a8b6a
Change-Id: I37be845fee3b9a46969b749ca3bca3d6f9425e2c
2016-10-27 15:29:01 +00:00
Michal Karpinski
0311b5dfca
Extending DNS event reporting am: f82d1596ce am: 3156b53fbe am: c1ca63e8cb
...
am: 6b5c634752
Change-Id: Id7b964d1d0ec70957b79eac98cda24b145eea79e
2016-10-27 15:27:36 +00:00
Eric Laurent
7f32fa70a9
Merge "radio: fix 64 bit process compatibility"
2016-10-27 15:23:08 +00:00
TreeHugger Robot
c024377dcf
Merge "Implement getTransparentRegion() using SkLatticeIter"
2016-10-27 14:13:19 +00:00
Leon Scroggins III
b5e74b90b2
Move SkMovie into frameworks/base
...
Test: Refactor. Relying on existing tests of android.graphics.Movie.
Skia is no longer working on SkMovie, so move it to the only place that
it is used.
Files moved from Skia (all the added files) are unchanged except for
renames (SkMovie -> Movie; SkGIFMovie -> GIFMovie).
Change-Id: I5f12d5def5fe825dda637f8aecf84e73e2dae9ca
2016-10-27 13:56:58 +00:00
Lorenzo Colitti
6f605a4e0f
Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a
...
am: 57ee5d7e9c
Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e
2016-10-27 13:38:34 +00:00
Michal Karpinski
c1b04a8b6a
Add connect event reporting am: 265494a0f8 am: 17be4d6c85
...
am: 8fba923d2a
Change-Id: I20bca735eba409fe17c8c1bbec1bce20a1ca0723
2016-10-27 13:31:09 +00:00
Lorenzo Colitti
57ee5d7e9c
Merge changes from topic 'netd_aosp' am: d19524f4f2
...
am: 853427a30a
Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
2016-10-27 13:30:02 +00:00
Michal Karpinski
6b5c634752
Extending DNS event reporting am: f82d1596ce am: 3156b53fbe
...
am: c1ca63e8cb
Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538
2016-10-27 13:30:02 +00:00
Michal Karpinski
8fba923d2a
Add connect event reporting am: 265494a0f8
...
am: 17be4d6c85
Change-Id: I042fdb187af2de08374864867dbd75d8c92c56c9
2016-10-27 13:21:37 +00:00
Lorenzo Colitti
853427a30a
Merge changes from topic 'netd_aosp'
...
am: d19524f4f2
Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
2016-10-27 13:20:34 +00:00
Michal Karpinski
c1ca63e8cb
Extending DNS event reporting am: f82d1596ce
...
am: 3156b53fbe
Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
2016-10-27 13:20:31 +00:00
Michal Karpinski
17be4d6c85
Add connect event reporting
...
am: 265494a0f8
Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
2016-10-27 13:13:56 +00:00
Michal Karpinski
3156b53fbe
Extending DNS event reporting
...
am: f82d1596ce
Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
2016-10-27 13:12:29 +00:00
Lorenzo Colitti
d19524f4f2
Merge changes from topic 'netd_aosp'
...
* changes:
Add connect event reporting
Extending DNS event reporting
2016-10-27 13:05:26 +00:00
Matt Sarett
7de7385897
Implement getTransparentRegion() using SkLatticeIter
...
This allows us to delete utils/NinePatchImpl.cpp and
utils/NinePatch.h
Test: Passed cts tests - DrawableTest, NinePatchTest,
NinePatchDrawableTest.
Change-Id: I6b5d09fa3479e758d8b931fa0e977c25f4435a7c
2016-10-27 08:22:38 -04:00
Diego Perez
4bcf5e7c47
Merge "Remove use of refSkPixelRef"
2016-10-27 10:15:41 +00:00
Michal Karpinski
265494a0f8
Add connect event reporting
...
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future CTS
Bug: 29748723
(cherry picked from commit 965894eeb9 )
Change-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc
2016-10-27 18:23:21 +09:00
Michal Karpinski
f82d1596ce
Extending DNS event reporting
...
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
(cherry picked from commit 14c9d2d0df )
Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
2016-10-27 18:23:16 +09:00
Andrii Kulian
debcf7603f
Merge "Refactor stack removal methods"
2016-10-27 07:52:07 +00:00
Bill Yi
01701d700c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours am: 3b2c3fe5ef -s ours am: ea109fa2c7 -s ours
...
am: 3882273957 -s ours
Change-Id: Ifbad3f8490583242e7d80397b5f3b975e88d0830
2016-10-27 05:34:10 +00:00
Bill Yi
1bf5f6a48e
Import translations. DO NOT MERGE am: 1377e2b985 -s ours am: df305805c6 -s ours am: 51521f2e18 -s ours
...
am: 973a754296 -s ours
Change-Id: Ief6e6da91a2a7745eb8092c211fdb7ba82b836ba
2016-10-27 05:33:20 +00:00
Bill Yi
1a5667fa6c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours am: d557ea9388 -s ours am: 0141333d25 -s ours
...
am: 63b7b89c96 -s ours
Change-Id: I33df334e2fa701cc015e8125c5e2500df826936f
2016-10-27 05:32:22 +00:00
Bill Yi
ec9b33d62e
Import translations. DO NOT MERGE am: d1b8917270 -s ours am: 6296c78ee4 -s ours am: 044be18ae4 -s ours
...
am: 901527ccef -s ours
Change-Id: I8db225d899925c52922f41825183b043f866fc6f
2016-10-27 05:31:22 +00:00
Bill Yi
4cb8229bfd
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours am: f0a5ebb129 -s ours
...
am: 1ef4b78ca3 -s ours
Change-Id: Idc0912b1f378417d5823f97701f8496755db6377
2016-10-27 05:30:32 +00:00
Bill Yi
4c43cc004c
Import translations. DO NOT MERGE am: bff09ae3c8 -s ours am: 305004ba4d -s ours
...
am: 7abc47da41 -s ours
Change-Id: Ib4a3c8cc185c893f478ad8858fc7b5c61eb6c084
2016-10-27 05:29:41 +00:00
Bill Yi
f06860ce08
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2 -s ours am: 6b8d9b2337 -s ours
...
am: 269392893b -s ours
Change-Id: I7b79f8e1d1052b53e3cb605f330a15c105f52a35
2016-10-27 05:28:52 +00:00
Bill Yi
ccf01a5236
Import translations. DO NOT MERGE am: 644a22437f -s ours am: 316c6df269 -s ours
...
am: ce37c7b14f -s ours
Change-Id: Ie696fc1f7d83b172e5859e9f82498882d5460d21
2016-10-27 05:28:04 +00:00
Bill Yi
3882273957
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours am: 3b2c3fe5ef -s ours
...
am: ea109fa2c7 -s ours
Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132
2016-10-27 05:25:03 +00:00
Android Build Merger (Role)
8a12f91c86
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours" into nyc-mr2-dev am: d37981be5a -s ours am: 64d92dc381 -s ours"
2016-10-27 05:24:50 +00:00