Dianne Hackborn
1a4b5a4f02
Work on issue #18640385 : Add procstats test mode
...
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.
Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.
And fixed meminfo --oom to work correctly again.
Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57
am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev
...
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
Add more -d dalvik details to dumpsys
2014-12-09 01:43:00 +00:00
Mathieu Chartier
063028aa68
Add more -d dalvik details to dumpsys
...
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).
Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0
Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d )
2014-12-08 17:33:56 -08:00
Mathieu Chartier
4ec1bdf52f
am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev
...
* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
Add more -d dalvik details to dumpsys
2014-12-09 01:31:11 +00:00
Mike Lockwood
b6b9a91c02
MIDI: API changes to support multiple ports per device
...
Add MidiInputPort and MidiOutputPort classes (with MidiPort base class)
A MidiDevice can now have multiple input and output ports.
Multiple ports are currently supported only for virtual devices, USB support coming later.
Change-Id: Ib55076aa1374aa46ae4ae76ad93bd717df6d7e21
2014-12-08 17:09:14 -08:00
Jeremy Joslin
902cc578a4
am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
...
* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
Don't send the same PendingIntent more than once.
2014-12-09 01:00:09 +00:00
Dianne Hackborn
9b07ba1990
am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751 : Additional items in aggregated battery stats" into lmp-mr1-dev
...
* commit '0cfdd810ded6f8486a6b0a61044594f58ab5c052':
Fix issue #17323751 : Additional items in aggregated battery stats
2014-12-09 00:59:01 +00:00
Mathieu Chartier
25c5e2b12d
Add more -d dalvik details to dumpsys
...
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).
Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0
Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
2014-12-08 16:38:20 -08:00
Alan Viverette
2bbf5575e7
am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
...
* commit '4b944f3ab8cd9959ccba3cee4cfd9fb36ab15a3a':
Fix auto-advance regression in radial time picker
2014-12-09 00:30:49 +00:00
Eino-Ville Talvala
18f5141dd8
am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
...
* commit 'b71d983a7ff7ba0d993c32692035ae92db0c9a44':
Camera2: Add HDR scene mode for backwards compatibility.
2014-12-09 00:19:23 +00:00
Eino-Ville Talvala
e50e596e50
am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
...
* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
Fix docs build
2014-12-09 00:19:15 +00:00
Alan Viverette
4b944f3ab8
am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
...
* commit '7781647aa90d7d7a070ecd79e52c2d8a11b59b5c':
Fix auto-advance regression in radial time picker
2014-12-09 00:18:40 +00:00
Pavel Zhamaitsiak
0cec63a283
am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-09 00:18:39 +00:00
Justin Harrison
04e8a5fb4c
am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
Add UUID for Pbap client
2014-12-09 00:18:35 +00:00
Fyodor Kupolov
77779aa3a5
am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
...
* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
Added isRemovingAdmin method
2014-12-09 00:18:21 +00:00
Jeff Sharkey
ea06d6ceb7
am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
...
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
Direct notification of network interface changes.
2014-12-09 00:18:01 +00:00
Alan Viverette
f758af4e72
am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
...
* commit '32230b2bdec14f33d793f8f3c89673b648139170':
Let host view handle long-press when using drag-to-open
2014-12-09 00:17:44 +00:00
Benjamin Franz
9c0e993d4e
am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
...
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
Change the routing path of bluetooth headset connections.
2014-12-09 00:17:44 +00:00
Alan Viverette
b0efde16ea
am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev
...
* commit '5a8b956fd22ffd2d4d54b47109c79748ff723d90':
Fix regression, don't NPE if Switch doesn't have a thumb set
2014-12-09 00:17:37 +00:00
Svet Ganov
aad2ffe67a
am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:17:31 +00:00
Svet Ganov
2dbd133c96
am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
...
* commit 'a91256bc75e510a254d4e5c6e8d1df8391f20bba':
Clear clicked nodes from the accessibiliy cache.
2014-12-09 00:17:24 +00:00
Filip Gruszczynski
0b6ccb4102
am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
Private Window flag to disable touch events in WallpaperService.
2014-12-09 00:17:18 +00:00
Raph Levien
e04cfa8aa5
am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
...
* commit '1918d0276ad502e45944bd75a187dd22021790c5':
Change Linkify leniency to VALID
2014-12-09 00:17:09 +00:00
Svetoslav
f2cc4e95b5
am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
...
* commit 'f477aeb367f05a64a03ed09efc9e0a9d6f9a6ec2':
Ensure all events from a showing window are dispatched.
2014-12-09 00:16:48 +00:00
Chet Haase
dda0529bd5
am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
...
* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
Fix seeking behavior
2014-12-09 00:16:20 +00:00
Zhentao Sun
af67d49865
am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
...
* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
Fixed a leak in GeofenceHardwareImpl.java.
2014-12-09 00:16:01 +00:00
Alan Viverette
7781647aa9
Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
2014-12-09 00:08:01 +00:00
Jeff Sharkey
2f1e953f8f
am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
...
* commit '4df65bf1eb454814954421403da9f8b5fcb82180':
Direct notification of network interface changes.
2014-12-09 00:07:37 +00:00
Alan Viverette
32230b2bde
am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
...
* commit '882a1e89742607a3f1fdaa8f5bbd0eb894fc0150':
Let host view handle long-press when using drag-to-open
2014-12-09 00:07:17 +00:00
Alan Viverette
5a8b956fd2
am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev
...
* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
Fix regression, don't NPE if Switch doesn't have a thumb set
2014-12-09 00:07:12 +00:00
Svet Ganov
7f980d7508
am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:07:06 +00:00
Svet Ganov
a91256bc75
am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
...
* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
Clear clicked nodes from the accessibiliy cache.
2014-12-09 00:07:01 +00:00
Alan Viverette
11a68e1803
Fix auto-advance regression in radial time picker
...
If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.
BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16
2014-12-08 15:54:38 -08:00
Jeff Sharkey
4df65bf1eb
Merge "Direct notification of network interface changes." into lmp-mr1-dev
2014-12-08 23:12:46 +00:00
Jeff Sharkey
6973634ce6
Direct notification of network interface changes.
...
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes. For example, when stacked network
interfaces change for a mobile network. To ensure that we pick up
all these details, directly wire the two services together.
Also remove some unused code for split network types.
Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Raph Levien
1a91d8df50
resolved conflicts for merge of b9d21d62 to master
...
Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2
2014-12-08 13:46:15 -08:00
Alan Viverette
882a1e8974
Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
2014-12-08 21:29:08 +00:00
Alan Viverette
db82c9e00e
Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev
2014-12-08 21:29:04 +00:00
Svet Ganov
381a423634
Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
2014-12-08 21:28:19 +00:00
Svet Ganov
e232d4a6aa
Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
2014-12-08 21:08:36 +00:00
Alan Viverette
01a0963006
Fix regression, don't NPE if Switch doesn't have a thumb set
...
BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3
2014-12-08 13:02:06 -08:00
Alan Viverette
298536b1a0
Let host view handle long-press when using drag-to-open
...
BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085
2014-12-08 12:31:14 -08:00
Alan Viverette
5a50a8bcab
am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
...
* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-08 19:45:20 +00:00
Jeff Sharkey
d5b5576dd6
am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
John Spurlock
ef10307e4a
am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
...
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
Zen: New behavior for built-in downtime + nextalarm conditions.
2014-12-08 19:43:38 +00:00
Jeremy Joslin
d4753450f3
am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
...
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
Don't send the same PendingIntent more than once.
2014-12-08 19:36:27 +00:00
Dianne Hackborn
0cfdd810de
am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751 : Additional items in aggregated battery stats" into lmp-mr1-dev
...
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
Fix issue #17323751 : Additional items in aggregated battery stats
2014-12-08 19:33:49 +00:00
Eino-Ville Talvala
b71d983a7f
am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
...
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
Camera2: Add HDR scene mode for backwards compatibility.
2014-12-08 19:17:38 +00:00
Eino-Ville Talvala
cfdc0762e2
am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
...
* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
Fix docs build
2014-12-08 19:17:31 +00:00
Pavel Zhamaitsiak
913c989546
am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-08 19:16:43 +00:00