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
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
de50a5e7e1
am 927d854f: Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev
...
* commit '927d854ff4dc66edd22c109400233eb2d76dfce6':
Optimize sysui ui queue during keyguard unlock.
2013-10-29 13:57:16 -07: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
23ac234e90
am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev
...
* commit '704269ec1cea0f68e21f51342d4d05825a53ae6a':
Mention external storage changes in KITKAT docs.
2013-10-29 13:49:42 -07:00
Jeff Sharkey
dd225d28e6
am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev
...
* commit '7fbba1622a975782fddb9a7c5d9dd733dd4e425d':
Suppress OperationCanceledException logging.
2013-10-29 13:49:39 -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
Elliott Hughes
ed84dea928
am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."
...
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
Fix a variety of small publicly-reported bugs.
2013-10-29 13:35:04 -07:00
Elliott Hughes
8f592378a1
am 69920427: Merge "Fix a variety of small publicly-reported bugs."
...
* commit '69920427ea01421d34f3a7576bdd135527b20859':
Fix a variety of small publicly-reported bugs.
2013-10-29 13:32:33 -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
961cc6717a
am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev
...
* commit '3f8367415095651e9dd8e074f97659a1b633e900':
Speculatively schedule input consumption
2013-10-29 13:23:17 -07:00
Michael Wright
3f83674150
Merge "Speculatively schedule input consumption" into klp-dev
2013-10-29 20:20:45 +00:00
Elliott Hughes
c367d48c55
Fix a variety of small publicly-reported bugs.
...
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556
Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546
Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557
Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560
Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549
Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552
Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553
Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554
Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
2013-10-29 13:12:55 -07: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
07873e3a72
am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
...
* commit '569220399841ae1a3fd62a1b77fa087bca2ee0f3':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:54:15 -07:00
Alex Klyubin
5692203998
am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
...
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:50:28 -07:00
Svetoslav
3a855ba522
am a4e1f435: am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev
...
* commit 'a4e1f4352149b15fa64e9b85928f0b1ba00486fb':
Share pack historical sorting using wrong keys.
2013-10-29 08:31:39 -07:00
Svetoslav
a4e1f43521
am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev
...
* commit 'ac5d3827409dff757531347c5232bb34ea727274':
Share pack historical sorting using wrong keys.
2013-10-29 08:28:45 -07:00
Svetoslav
37a5a1ea87
am 330c6be9: am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev
...
* commit '330c6be9dcda95cc2666c2a0cb62ea1cfc9a1d48':
Not show share targets that cannot be launched.
2013-10-29 08:28:05 -07:00
Svetoslav
330c6be9dc
am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev
...
* commit '86bfb3af4296a1263cb2c01a9e87b5b20015fedb':
Not show share targets that cannot be launched.
2013-10-29 08:25:18 -07:00
Svetoslav
ac5d382740
Merge "Share pack historical sorting using wrong keys." into klp-dev
2013-10-29 15:24:14 +00:00
Svetoslav
86bfb3af42
Merge "Not show share targets that cannot be launched." into klp-dev
2013-10-29 15:23:27 +00:00
Svetoslav
27f592df8c
Share pack historical sorting using wrong keys.
...
The ActivityChooserModel keeps a history of the last fifty
share targets and based on past usage orders the targets in
the UI. The soring implementation is using a map for improving
performance. However, the activities in this map were keyed
on the package name but there maybe more that one share
target per package. Thus, the sorting was generating bad
results. Now the unique component name is used.
bug:11195578
Change-Id: I8c7018fea168b7253ddbe57b477028368726e75e
2013-10-28 18:43:08 -07:00
Svetoslav
c19c3c8d04
am c7f18b52: am 099d842b: Update javadoc to fix the build.
...
* commit 'c7f18b526f2029e78ea609db688854439e180d31':
Update javadoc to fix the build.
2013-10-28 16:39:41 -07:00
Svetoslav
c7f18b526f
am 099d842b: Update javadoc to fix the build.
...
* commit '099d842bdac481ea94527ab1f702342e41dca440':
Update javadoc to fix the build.
2013-10-28 16:34:55 -07:00
Svetoslav
baeabb65e1
Not show share targets that cannot be launched.
...
This changes filters out share targets that we cannot start
because the target does not properly implement the SEND protocol
and has either share target activity hidden or requires a
permission to launch it. Also the code that launches the share
target activity catches the runtime exception and shows an error
message. Note that being able to launch an activity in a moment
of time is not a guarantee that one can do that latter. Hence,
being able to launch an activity while building the share UI
does not guarantee that one can launch it when selecting the
share target.
bug:11402139
Change-Id: Id35732510755b2eeb9eccacc046d289c2f2ee856
2013-10-28 16:26:47 -07:00
Alex Klyubin
019118af67
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
...
The method was returning all supported cipher suites instead of the
default ones only. The default list of cipher suites actually used by
sockets created by this factory is not affected by this issue.
Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
2013-10-28 16:24:33 -07:00
Svetoslav
099d842bda
Update javadoc to fix the build.
...
Change-Id: Ib6e8c17f10a7f17785876681baf8fb07eac9af55
2013-10-28 15:56:48 -07:00
Svetoslav
0298ebb2db
am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
...
* commit '60fb1e28375b9c0dc7505214f3ab33bdd38f7aa8':
Complete implementation of the advanced print options.
2013-10-28 15:12:26 -07:00
Svetoslav
60fb1e2837
am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
...
* commit '714ba34556572d36b1f9f8d9b860c4da24da6361':
Complete implementation of the advanced print options.
2013-10-28 15:09:12 -07:00
Svetoslav
714ba34556
Merge "Complete implementation of the advanced print options." into klp-dev
2013-10-28 22:07:03 +00:00
Dianne Hackborn
a03fc2c296
am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
...
* commit '1c18c5d40ce7004d28aaa8f6c6713efcc72e6706':
Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes
2013-10-28 15:05:46 -07:00
Dianne Hackborn
1c18c5d40c
am 3a702cb5: Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
...
* commit '3a702cb5d7eac0d8504c67145dded5d45a9c1027':
Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes
2013-10-28 15:02:32 -07:00
Dianne Hackborn
3a702cb5d7
Merge "Fix issue #11391003 : Allow dumpsys meminfo to be used with native processes" into klp-dev
2013-10-28 21:59:18 +00:00
Baligh Uddin
c98c6cc649
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-28 19:33:46 +00:00
Svetoslav
b4fda13476
Complete implementation of the advanced print options.
...
1. Implemented the advanced printer options integration. Now a print service
may declare an advanced print options activity which may be launched by
the user if the current printer supports advanced print options. These options
are visible only to the print service that added them and it is the only party
that will interpret the options.
2. Fixed a couple of bugs in the saved print jobs parsing. One was that if there
are more than one page range, a half of the print job properties was not
properly parsed. The other was that the media size constructor was using
incorrect argument order, thus creating a media size with wring width.
3. Fixed and edge case where old print jobs and their docs can get stuck in
the spooler. If the app did not write the requested pages we were not showing
an error message, rather just finish the activity without canceling the print
job and this print job is stuck in the spooler. Now we show an error message
and the user may retry, cancel. If the user cancels the print job is also
cancelled, thus no leftover in the spooler.
4. Fixed the background color of the print dialog to meet UX spec.
bug:11241800
Change-Id: I352440bc86aec824a805883fc9579d96a06d11e6
2013-10-28 11:44:07 -07:00
Vineeta Srivastava
e1b16b09d0
am ccf1a88d: am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
...
* commit 'ccf1a88daf17726a72d643439bc8b7456c1bed92':
Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:57:23 -07:00
Vineeta Srivastava
ccf1a88daf
am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
...
* commit '2ead75109cf21223b7754fc3906c86d2fbd145cb':
Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:51:27 -07:00
Vineeta Srivastava
2ead75109c
Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
2013-10-28 16:48:53 +00:00
Baligh Uddin
55e168f544
Import translations. DO NOT MERGE
...
Change-Id: Ic80d15c427e2f67465a6c45ab08d0ffcb618ae62
Auto-generated-cl: translation import
2013-10-28 09:47:23 -07:00