Jim Miller
657b99f177
am ee3b039a: am aa8dbf11: am 43ef1c8c: Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
...
* commit 'ee3b039ac679f58a3f34813f6b70798761a406b1':
Remove deprecated API calls to KeyguardManager from statusbar
2013-10-31 15:32:06 -07:00
Jim Miller
ee3b039ac6
am aa8dbf11: am 43ef1c8c: Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
...
* commit 'aa8dbf111444435b6071f7b226af5a7bb2a56c52':
Remove deprecated API calls to KeyguardManager from statusbar
2013-10-31 15:30:02 -07:00
Jim Miller
43ef1c8c34
Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
2013-10-31 22:22:58 +00:00
Svetoslav
7b4bb2f75e
am 4379bd75: am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
...
* commit '4379bd751877056ffa236d0eb8a6cf59b8732d2c':
Cancel current work in PrintDocumentAdatper if printing is cancelled.
2013-10-31 14:51:45 -07:00
Svetoslav
4379bd7518
am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
...
* commit 'eccfe65f9daf459342ebc658b8a40584dfcea016':
Cancel current work in PrintDocumentAdatper if printing is cancelled.
2013-10-31 14:48:22 -07:00
Chet Haase
9f30380db3
am 93830ffb: am df52471c: am 5747919f: Merge "Fix leak in TransitionInflater" into klp-dev
...
* commit '93830ffb1479dad289958c96cc66c11d0efdae34':
Fix leak in TransitionInflater
2013-10-31 14:44:51 -07:00
Chet Haase
93830ffb14
am df52471c: am 5747919f: Merge "Fix leak in TransitionInflater" into klp-dev
...
* commit 'df52471c994f2374ae87ce52dbad61b43e7285e8':
Fix leak in TransitionInflater
2013-10-31 14:42:44 -07:00
Svetoslav
6ce161d176
Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
2013-10-31 21:42:06 +00:00
Chet Haase
5747919fed
Merge "Fix leak in TransitionInflater" into klp-dev
2013-10-31 21:38:21 +00:00
Jim Miller
a999d463c1
Remove deprecated API calls to KeyguardManager from statusbar
...
Fixes bug 11448304
Change-Id: I3049a20d9320af0425d7a8f08d5aa208e470e292
2013-10-31 14:32:29 -07:00
Svetoslav
d270cb9264
Cancel current work in PrintDocumentAdatper if printing is cancelled.
...
Layout and write may take some time during which the user can
cancel printing. Currently we wait for the last operation,
being write or layout, to complete before closing the print
dialog. Now in such a scenario we request a cancellation of
the ongoing operation.
bug:11329523
Change-Id: Ia9d747163cc73509369a86c8b5afc83b7ee54859
2013-10-31 14:30:58 -07:00
Chet Haase
58ad12208a
Fix leak in TransitionInflater
...
A static map in TransitionInflater keyed off of Context instances,
which could cause contexts/activities to leak over time. This
fix removes that map and simply creates a new inflater each time.
The savings of the cached inflater was minimal an unnecessary, and the
intended sharing is in the context embedded in the inflater anyway.
Issue #11436919 leak in TransitionInflator
Change-Id: Ic05ca47f57723bd572bb6143df4035d66eedf5ad
2013-10-31 14:25:56 -07:00
Jason Monk
c761f3b6d0
am 7c053a2f: am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev
...
* commit '7c053a2fa5b9f280faa03fff63ed2d11d6cf5211':
Change PacProxySelector to return unresolved addr
2013-10-31 11:54:47 -07:00
Jason Monk
7c053a2fa5
am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev
...
* commit 'cb1342032283d1a415eb4f916a79039aa8ed0cbf':
Change PacProxySelector to return unresolved addr
2013-10-31 11:50:07 -07:00
Jason Monk
86f5a1499b
Merge "Change PacProxySelector to return unresolved addr" into klp-dev
2013-10-31 18:43:53 +00:00
Chris Craik
62ac0501c6
am 7595aa94: am 3be09114: am b320f4d5: Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev
...
* commit '7595aa9420cec603674327b9056fc5ad8a6aa191':
Revert "Fixed incorrect calculation of dirty invalidation area"
2013-10-31 11:20:18 -07:00
Jason Monk
179d6e8e20
Change PacProxySelector to return unresolved addr
...
This was found by a bug in Firefox where it expects the addresses from a
ProxySelector to be unresolved. Since ProxySelectorImpl returns unresolved
addresses the PAC version should as well to avoid breaking apps.
The ProxyServer also needed to be updated to reflect this change as it was
expecting a resolved InetSocketAddress.
Bug: 11443853
Change-Id: I3a4e9e248d22d7808603c147660df708e01cdf82
2013-10-31 14:17:48 -04:00
Chris Craik
7595aa9420
am 3be09114: am b320f4d5: Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev
...
* commit '3be09114ca8015be91f34108739b711154f58b77':
Revert "Fixed incorrect calculation of dirty invalidation area"
2013-10-31 11:17:47 -07:00
Chris Craik
b320f4d5a6
Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev
2013-10-31 18:12:05 +00:00
Chris Craik
7546a4bea7
Revert "Fixed incorrect calculation of dirty invalidation area"
...
bug:11351836
Because SeekBar's thumb Drawable (among others) is positioned without
padding offset baked in, include that offset when invalidating.
This revert fixes invalidate positioning in the system volume SeekBar,
where the original CL broke full redrawing of the thumb Drawable when
it switched states.
This reverts commit e9018f7716 .
Change-Id: I5b3b07e47f466269f8d349e9a63dc29bf213120b
2013-10-31 10:45:24 -07:00
Przemyslaw Szczepaniak
4fa4a1ae55
am 2fbe5a99: am ec11e8dd: Merge "Catch MissingResourceException caused by bad locale in TTS." into klp-dev
...
* commit '2fbe5a99e92ec4fba60f45c9bf6d4f2d7c7f021d':
Catch MissingResourceException caused by bad locale in TTS.
2013-10-31 05:46:43 -07:00
Alan Viverette
aaa026a9a4
Merge "Restore A11y and keyboard focus positions after GridView layout"
2013-10-31 01:14:11 +00:00
Alan Viverette
5d565faab2
Restore A11y and keyboard focus positions after GridView layout
...
Implementation copied verbatim from ListView. Moved a common helper
method into AbsListView.
BUG: 11438088
Change-Id: Iae44a8f3743669f63a67fd20f22dfc0486a1d063
2013-10-30 11:09:03 -07:00
Przemyslaw Szczepaniak
ca4f1fc57c
Catch MissingResourceException caused by bad locale in TTS.
...
Malformed locale objects will throw MissingResourceException
from getISO3Country() and getISO3Language() methods.
This change guard against the case where device default locale is
malformed and user tries to get TTS default locale (b/10814409)
and case where user tries to pass bad locale as argument to
TextToSpeech.getFeatures method (b/10494193).
Bug:11429552
Bug:10494193
Bug:10814409
Change-Id: Ie54d5d30bb042324da0c0d19b77c3a932c5642f7
(cherry picked from commit 58f1665372 )
2013-10-30 10:21:34 +00:00
Jeff Brown
c762ac24de
am 4c62da69: am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
...
* commit '4c62da692ce5159a187644ca76f7de2063bbf057':
Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 18:32:32 -07:00
Jeff Brown
aa2f9f01fa
am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
...
* commit '81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4':
handle negative temperature
2013-10-29 18:32:29 -07:00
Jeff Brown
4c62da692c
am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
...
* commit '145cac85f8ff077447d282c147e4c8865833b76a':
Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 18:31:00 -07:00
Jeff Brown
81b7caf0d1
resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
...
Change-Id: I769e7acbe207b9c3a60ff1576d11b3ab40b8c66d
2013-10-29 18:28:57 -07:00
John Spurlock
3ec7e54c8a
am 646f19c9: am de50a5e7: am 927d854f: Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev
...
* commit '646f19c929ae85ab703533c36962292fa6c990ca':
Optimize sysui ui queue during keyguard unlock.
2013-10-29 14:59:35 -07:00
Jeff Sharkey
e4d5f6e24e
am 8f541938: am 23ac234e: am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev
...
* commit '8f5419383283c6e82d2038ca807c3c55281d8fa2':
Mention external storage changes in KITKAT docs.
2013-10-29 14:59:32 -07:00
Jeff Sharkey
854419b5c7
am 88c84f97: am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev
...
* commit '88c84f97186b9f5808949a8b11357f6f8d27f046':
Suppress OperationCanceledException logging.
2013-10-29 14:59:28 -07:00
Siva Velusamy
9d870af278
Merge "Fix Javadoc error"
2013-10-29 21:19:08 +00:00
Siva Velusamy
d41b852f92
Fix Javadoc error
...
This fixes an error introduced with I180296d413a18301cead1c8e3212de2bd0c7e32d
Change-Id: I06512a0fb388738fae5bba5540189095f23f1e2a
2013-10-29 14:11:11 -07:00
Jeff Brown
145cac85f8
am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
...
* commit '4bf6eb1775649a803efcc6da8f06e5083ed24f34':
Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 14:06:07 -07:00
Jeff Brown
5214dae44c
am 6dbbba4e: Merge "handle negative temperature"
...
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
handle negative temperature
2013-10-29 14:02:34 -07:00
John Spurlock
646f19c929
am de50a5e7: am 927d854f: Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev
...
* commit 'de50a5e7e116870cded377c77c5dbe8fa2498b40':
Optimize sysui ui queue during keyguard unlock.
2013-10-29 14:01:56 -07:00
Jeff Brown
4bf6eb1775
Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
2013-10-29 21:01:13 +00:00
Jeff Brown
6dbbba4e9a
Merge "handle negative temperature"
2013-10-29 20:59:38 +00:00
John Spurlock
927d854ff4
Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev
2013-10-29 20:55:04 +00:00
Jeff Sharkey
8f54193832
am 23ac234e: am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev
...
* commit '23ac234e9049512696c7e7c6f277e334fde50f7a':
Mention external storage changes in KITKAT docs.
2013-10-29 13:52:58 -07:00
Jeff Sharkey
88c84f9718
am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev
...
* commit 'dd225d28e6e7a57a9ae70c4a7f6217358e3a2052':
Suppress OperationCanceledException logging.
2013-10-29 13:52:54 -07:00
Jeff Sharkey
704269ec1c
Merge "Mention external storage changes in KITKAT docs." into klp-dev
2013-10-29 20:46:42 +00:00
Jeff Sharkey
7fbba1622a
Merge "Suppress OperationCanceledException logging." into klp-dev
2013-10-29 20:46:39 +00:00
Michael Wright
0160bcbe53
am 0116f08b: am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev
...
* commit '0116f08b387d237c334b10bb0266426e1ab3c793':
Speculatively schedule input consumption
2013-10-29 13:29:34 -07:00
Michael Wright
0116f08b38
am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev
...
* commit '961cc6717a59eaff449acf1ddd3d3857d8c47430':
Speculatively schedule input consumption
2013-10-29 13:26:06 -07:00
Michael Wright
3f83674150
Merge "Speculatively schedule input consumption" into klp-dev
2013-10-29 20:20:45 +00:00
Jeff Sharkey
3ec2f60ebd
Mention external storage changes in KITKAT docs.
...
Bug: 11388971
Change-Id: I97145472948867f54125f1d0f0237bf3b339535e
2013-10-29 12:23:19 -07:00
Jeff Sharkey
33819318f6
Suppress OperationCanceledException logging.
...
These exceptions are normal when an app has cancelled an outstanding
thumbnail request.
Bug: 11385378
Change-Id: I8aed5721b447cda5baf447ac7afd627aa1062863
2013-10-29 11:56:37 -07:00
John Spurlock
e7c285725d
Optimize sysui ui queue during keyguard unlock.
...
Target the two biggest offenders:
- Coalesce keyguard setHidden(false) calls during unlock.
- Make sysui->WM call async.
Found during investigation into b/11221659.
Bug: 11221659
Change-Id: Icab48376bc356a933e0f9940bc2f924e2e77ab22
2013-10-29 14:27:41 -04:00
Alex Klyubin
be7f22b7a8
am 07873e3a: am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
...
* commit '07873e3a72da254bcdf965f6fa76bdcc800ef511':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:56:18 -07:00