Robert Greenwalt
c3eef19047
am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:39:43 -08:00
Robert Greenwalt
f1612bcfdd
am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
...
* commit 'e8c51298a43f607fea7418ced7cc783e6065fe87':
Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:32:53 -08:00
Robert Greenwalt
e8c51298a4
Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
2013-11-07 18:30:49 +00:00
Dianne Hackborn
03be79b35c
am fbf4888d: am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:21:34 -08:00
Dianne Hackborn
fbf4888d19
am 9882d388: Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
...
* commit '9882d3889957200c3db62f47142988dea99a7291':
Fix issue #11223338 : Not retaining service started state while restarting
2013-11-07 10:18:53 -08:00
Dianne Hackborn
9882d38899
Merge "Fix issue #11223338 : Not retaining service started state while restarting" into klp-dev
2013-11-07 18:16:10 +00:00
John Spurlock
74bdc178ca
am de46104a: am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
...
* commit 'de46104a3797653f6e564ca3774dc9528dd1ac1e':
Docfixes for DownloadManager.
2013-11-06 21:24:09 -08:00
John Spurlock
de46104a37
am 317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
...
* commit '317c79f80b878a4cbc99979a13a1b3c6cf948767':
Docfixes for DownloadManager.
2013-11-07 05:19:33 +00:00
Newton Allen
badb59cd5d
am 47feee53: Merge "Fix some documentation typos." into klp-docs
...
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
Fix some documentation typos.
2013-11-07 05:19:12 +00:00
Robert Greenwalt
a029ea1318
Add BatteryStats for Wifi Batched Scanning.
...
bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
2013-11-06 17:43:18 -08:00
Dianne Hackborn
daa0d5c929
Fix issue #11223338 : Not retaining service started state while restarting
...
When I cleaned up how we maintained the lifecycle of the tracker with a
service, I broke most tracking of the service restart state. (Since at
that point the service is no longer associated with a process, so I
must clean up the tracker state). This change introduces a new special
case for interacting with a service tracker to explicitly tell it when
a service is being restarted. It also fixes how we update the process
state when services are attached to it, so it goes in and out of the
restarting state correctly.
In addition:
- Maybe fix issue #11224000 (APR: Dependent processes not getting added
to LRU list). We were not clearing ServiceRecord.app when bringing
down a service, so if for some reason there were still connections to
it at that point (which could happen for example for non-create bindings),
then we would so it when updating the LRU state of that client process.
- dumpsys procstats's package argument can now be a package or process
name, and we will dump all relevent information we can find about that
name.
- Generally improved the quality of the dumpsys procstats output with its
various options.
- Fixed a bug in ActivityManager.dumpPackageState() where it would hang if
the service was dumping too much, added meminfo to the set of things
dumped, and tweaked command line options to include more data.
- Added some more cleaning code to ActiveServices.killServices() to make
sure we clean out any restarting ServiceRecord entries when a process is
being force stopped.
- Re-arranged ActiveServices.killServices() to do the main killing of the
service first, to avoid some wtf() calls that could happen when removing
connections.
Bug: 11223338
Bug: 11224000
Change-Id: I5db28561c2c78aa43561e52256ff92c02311c56f
2013-11-06 16:42:17 -08:00
Patrick Tjin
b4328566fa
am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
...
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
Add HSPA+ to BatteryStats
2013-11-06 10:20:00 -08:00
Ruben Brunk
5717190521
am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
...
* commit '6327136cdb1a0438132ea9d91c3b498a034ec071':
gcam: Avoid leaking repeating CaptureRequests.
2013-11-06 10:13:03 -08:00
Patrick Tjin
bd9513f3b2
Merge "Add HSPA+ to BatteryStats" into klp-dev
2013-11-06 18:12:47 +00:00
Ruben Brunk
6fe15c3d5f
Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
2013-11-06 18:07:28 +00:00
Adam Lesinski
9aaf4e13f0
am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
...
* commit '35040fdc428669bf7e3a1ec9ea388fb49ede32df':
Fix off-by-one issue when removing from Iterator
2013-11-06 09:54:46 -08:00
Adam Lesinski
1aac29c3dd
Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf
Add HSPA+ to BatteryStats
...
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.
Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
2013-11-06 17:29:33 +00:00
Jeff Sharkey
2b80a35cb5
am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev
...
* commit 'f5073e71c2d5d124865d01ad9343793f6fcf620c':
Clarify DocumentsProvider recents behavior.
2013-11-05 13:56:58 -08:00
Jeff Sharkey
5f4affdab8
Merge "Clarify DocumentsProvider recents behavior." into klp-dev
2013-11-05 20:46:11 +00:00
Jeff Sharkey
37ed78e504
Clarify DocumentsProvider recents behavior.
...
Bug: 11448309
Change-Id: I17e0ac757e549b251e08d58d5ce7d25fb253883f
2013-11-05 12:38:21 -08:00
Fabrice Di Meglio
641bac8e21
am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
...
* commit '073041c3708b5856a027d32c93c6945e2266336e':
Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
2013-11-04 21:55:31 -08:00
Fabrice Di Meglio
346d001b6f
am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
...
* commit '0804ff1f5a27239c7bc5b02581585f4a61e72aa6':
Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
2013-11-04 21:55:27 -08:00
Svetoslav
109c0a2193
am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
...
* commit 'b1dac2f49bd462c9a5f93390ddcc563a7044ea50':
PreferenceFragment showing the breadcrumb when not needed.
2013-11-04 21:54:39 -08:00
Brian Carlstrom
5f4a89480a
am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
...
* commit 'c8b01295bc5dcfcd2d9559f366e175db086eae37':
Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:54:21 -08:00
Adam Powell
a20bfd96ba
am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
...
* commit 'fe803958d8c38fa865116912cff95c436d6db4e2':
Fix action menu visibility callbacks for nested popups
2013-11-04 21:54:18 -08:00
Adam Powell
b688a0c9ac
am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
...
* commit '9382a071612231ee355128f71efb5877550074d9':
Fix incorrect content description on action bar home/up
2013-11-04 21:54:14 -08:00
Victoria Lease
c403afb642
am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
...
* commit '79007026935acf84baba183aad0ef654d9ed91aa':
use SpannedStringBuilder to build a SpannedString
2013-11-04 21:54:02 -08:00
Brian Carlstrom
94edb33909
am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
...
* commit '10193b78b87a18e5fee7faa4890a01946934000c':
Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:53:29 -08:00
Newton Allen
04b7821496
am 47feee53: Merge "Fix some documentation typos." into klp-docs
...
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
Fix some documentation typos.
2013-11-04 19:25:58 -08:00
Fabrice Di Meglio
f48bcd5b68
Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
2013-11-05 00:46:19 +00:00
Fabrice Di Meglio
cad157b370
Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
2013-11-05 00:45:41 +00:00
John Spurlock
92a262c7f4
Docfixes for DownloadManager.
...
Change-Id: If01420ed3964fda89c459d3f9021b5088520b6b1
2013-11-04 16:25:38 -05:00
Svetoslav
517220b468
Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
2013-11-04 19:09:49 +00:00
Brian Carlstrom
60999fcb2e
Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
2013-11-04 17:57:15 +00:00
Adam Powell
1262d0c864
Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
2013-11-04 17:55:24 +00:00
Adam Powell
b611eb94e9
Merge "Fix incorrect content description on action bar home/up" into klp-dev
2013-11-04 17:55:05 +00:00
Victoria Lease
3dbea35f7e
Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
2013-11-04 16:23:15 +00:00
Brian Carlstrom
e92f19e58c
Treat UnsatisfiedLinkError as non-fatal
...
Bug: 11466297
Change-Id: I12be43564da37290b3ee52b1858e44f2229711d9
2013-11-03 22:47:11 -08:00
Adam Powell
b411b32861
Fix action menu visibility callbacks for nested popups
...
When opening a submenu from a popup in ActionMenuPresenter, delegate
the submenu callbacks to the presenter callback registered on the
ActionMenuPresenter. This allows menu visibility callbacks to
propagate properly so that apps that hide their action bars after a
timeout can detect open menus that are deeply nested.
Bug 11429613
Change-Id: I3332886f08d4f9010f0875057c457566301d12ec
2013-11-01 18:22:11 -07:00
Adam Powell
f37a5139db
Fix incorrect content description on action bar home/up
...
Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.
Bug 10969992
Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70
2013-11-01 16:36:49 -07:00
Brian Carlstrom
a51052d17c
Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
2013-11-01 22:51:07 +00:00
Brian Carlstrom
5637ffced9
Move set of persist.sys.dalvik.vm.lib to SystemServer only
...
Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
2013-11-01 14:51:58 -07:00
Victoria Lease
24aecc3fb6
am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:30:51 -07:00
Victoria Lease
ee4c84642a
Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
2013-11-01 20:22:42 +00:00
Michael Wright
d35e94a3cb
am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev
...
* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
Only call dump when a ViewRoot actually exists
2013-11-01 13:18:39 -07:00
Michael Wright
4846a93b55
Merge "Only call dump when a ViewRoot actually exists" into klp-dev
2013-11-01 20:11:48 +00:00
Michael Wright
5f48dc7409
Only call dump when a ViewRoot actually exists
...
Bug: 11446494
Change-Id: I47e35d7b4d49d6893ba0c9f8ad05b31f91be85d2
2013-11-01 12:42:49 -07:00
Michael Wright
9730fbc0ea
am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app
...
* commit 'cd250cc8b781c64df8b8d63853d9082f29a6fc2f':
Check view and focus invariants after calling into app
2013-11-01 12:31:30 -07:00
Michael Wright
17d28ca3d7
Check view and focus invariants after calling into app
...
When we dispatch input events into the actual application, make sure
the input invariants we rely on haven't changed. If they have, we
drop the event and log why.
Bug: 11399505
Change-Id: Id772e41ca41dc332bb02725ab486e3b10a73c220
2013-11-01 19:13:20 +00:00