Andreas Huber
cb52d012e9
Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
2011-09-30 11:13:21 -07:00
Steven Ross
d42825f40e
Merge "calling back SetupFaceLock to clean up temporary gallery"
2011-09-30 11:08:47 -07:00
Gilles Debunne
eba3d92341
Merge "Bug 5384675: Color in add to dictionary"
2011-09-30 10:58:30 -07:00
Gilles Debunne
9fb46925d3
Merge "Bug 5384535: Underline for typo even if there are no suggestions"
2011-09-30 10:58:10 -07:00
Gilles Debunne
5b92a451c0
Merge "Bug 5254884: suggestions are no logner copied in the clipboard"
2011-09-30 10:58:01 -07:00
Gilles Debunne
67ed574cdb
Merge "Bug 5250788: EditText gets slower has the entered text gets longer"
2011-09-30 10:57:51 -07:00
Gilles-Arnaud Bleu-Laine
9a6ed36ba5
Gracefuly return on detecting wrong AAC format from corrupted files
...
Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.
The current CHECK() interrupts the configurecodec() preventing a graceful
exit.
Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
2011-09-30 10:46:12 -07:00
repo sync
df4a97ede4
am 8b42fcef: Fix wifi data activity icons
...
* commit '8b42fcef5ac33d94b76e3002861d4ea4081a6a4f':
Fix wifi data activity icons
2011-09-30 10:21:53 -07:00
Gloria Wang
289d93ab3f
Merge "Wait for some time before stopping the media recorder. Fix for bug 5239001."
2011-09-30 10:17:37 -07:00
repo sync
8b42fcef5a
Fix wifi data activity icons
...
Bug: 5393252
Change-Id: I6ca650b4f722b2c8cc4d17b1bc6ec2f2c0b7e10d
2011-09-30 10:14:38 -07:00
Gloria Wang
627f445a23
Wait for some time before stopping the media recorder.
...
Fix for bug 5239001.
Change-Id: Ifa18a404e8568cced88a93b8d1a7125875aadb15
2011-09-30 10:05:33 -07:00
repo sync
df73a55870
Merge "Fix wifi data activity icons"
2011-09-30 09:57:51 -07:00
repo sync
82afa6e61e
Merge "Fix IPv6 on wifi"
2011-09-30 09:57:36 -07:00
Mark Wagner
ff1ea0dc53
Merge "bugfix 5381702 MMS app puts temporary files on sdcard in wrong location"
2011-09-30 09:55:10 -07:00
Xavier Ducrohet
58b9157549
Merge "LayoutLib: Fix native delegate for Display."
2011-09-30 09:41:35 -07:00
Wei Huang
51e6e3f2ef
Merge "Convert content type "image/jpg" to "image/jpeg"."
2011-09-30 09:23:03 -07:00
Kenny Root
83a5926ee3
Merge "Add DUMP permission checks to services"
2011-09-30 08:57:43 -07:00
repo sync
ecc430e9f5
Fix wifi data activity icons
...
Bug: 5393252
Change-Id: I6ca650b4f722b2c8cc4d17b1bc6ec2f2c0b7e10d
2011-09-30 07:57:50 -07:00
Daniel Sandler
1402bb1901
Merge "Add carrier info back to notification drawer."
2011-09-30 07:48:51 -07:00
Daniel Sandler
d88110d27e
Merge "Bring back nyandroid ADB icon."
2011-09-30 07:48:43 -07:00
The Android Open Source Project
0d3451261d
Reconcile with ics-factoryrom-release
...
Change-Id: Ia9dffe4458e064a55878e989ba73763158e008fe
2011-09-30 07:09:59 -07:00
satok
3e21c99f10
Merge "Fix a logic to recconect IME in InputMethodManagerService"
2011-09-30 03:31:35 -07:00
satok
59b424c3b6
Fix a logic to recconect IME in InputMethodManagerService
...
Bug: 5380216
Change-Id: I7af67265eebbd28f002210d7ac90dd18f1858f66
2011-09-30 19:26:01 +09:00
satok
594cb47654
Merge "Use user's settings for the spell check language instead of the system locale"
2011-09-30 01:52:40 -07:00
satok
70deff4c10
Use user's settings for the spell check language instead of the system locale
...
Bug: 5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
2011-09-30 17:49:40 +09:00
Luca Zanolin
af43add388
Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling."
2011-09-30 01:01:35 -07:00
Owen Lin
e29288629d
Convert content type "image/jpg" to "image/jpeg".
...
"image/jpg" is not a valid mimetype while "image/jpeg" is.
So change it to "image/jpeg" to increase the compatibillity with other
Apps in android. (e.g., Gallery)
bug: 5342561
Change-Id: Ia37433e35482492b7226c87a670bef3399ac4bb6
2011-09-30 15:26:34 +08:00
The Android Automerger
d435a0d076
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 18:46:30 -07:00
Mathias Agopian
5c06f0f0d0
am 5d9a4f33: Merge "improve hwc log output" into ics-factoryrom
...
* commit '5d9a4f33d3f1fcce55b686597d370d749b5c5c0d':
improve hwc log output
2011-09-29 18:37:44 -07:00
Mathias Agopian
5d9a4f33d3
Merge "improve hwc log output" into ics-factoryrom
2011-09-29 18:34:22 -07:00
Xavier Ducrohet
387d078e64
LayoutLib: Fix native delegate for Display.
...
Change-Id: If097cae2309d340162b3bac1d0f6a2289635adca
2011-09-29 18:33:50 -07:00
Mathias Agopian
1f84f44bfa
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
2011-09-29 18:12:20 -07:00
Mathias Agopian
7db6da4049
Merge "improve hwc log output"
2011-09-29 18:09:35 -07:00
Mathias Agopian
1f29cbe8f4
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I70884ae458a9dcf10cfc403258d48eaa4618b7f4
2011-09-29 18:07:08 -07:00
Svetoslav Ganov
2783b4fa43
Merge "ActivityChooserView shows "see all" improperly."
2011-09-29 17:54:22 -07:00
Fabrice Di Meglio
46c78b4de1
Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-09-29 17:53:09 -07:00
Christopher Tate
86b734972d
Merge "Enforce DUMP permission on BackupManagerService's dump() method"
2011-09-29 17:28:29 -07:00
Romain Guy
638f17c1b7
Merge "TextureView works best when it draws stuff. Bug #5391188 "
2011-09-29 17:23:52 -07:00
Romain Guy
59c7f80dd2
TextureView works best when it draws stuff.
...
Bug #5391188
Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
2011-09-29 17:21:45 -07:00
repo sync
7960d9f888
Fix IPv6 on wifi
...
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
2011-09-29 16:59:01 -07:00
Svetoslav Ganov
1c07e22c36
ActivityChooserView shows "see all" improperly.
...
1. The cooser was presenting the "Show all" option if the number
of available activities was more than the initial max count of activities
to be shown. Since the show all option is added to the drop down
the latter becomes effectively one longer than the initial max activity
count which may make the drop down taller than client expectats. Also
this leads to the case where if the activities are one more than the
initial activity count pressing the show all button will just replace
the show all item with the activity that did not fit - this is somehow
annoying to the user.
bug:5379282
Change-Id: I2693214cb0b66edb2a3bdffc01ed29139341111c
2011-09-29 16:51:04 -07:00
Amith Yamasani
966222ef24
Merge "Handle the case of Preference lists that have header views inserted at the top."
2011-09-29 16:48:55 -07:00
Romain Guy
1e70aa94c1
Merge "Add system property to force hw acceleration."
2011-09-29 16:39:16 -07:00
Romain Guy
9622e20486
Add system property to force hw acceleration.
...
Change-Id: I538e641435f282b1af20866a8acd1f8d292734c4
2011-09-29 16:38:24 -07:00
Mangesh Ghiware
293fe94920
Merge "Force a WebView pictureset reset on screen rotation."
2011-09-29 15:57:51 -07:00
The Android Automerger
1b7c745bbe
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 15:21:22 -07:00
Amith Yamasani
2d43d283fc
Handle the case of Preference lists that have header views inserted at the top.
...
Without this change, wrong Preference is returned when you select one.
Subtract the number of headers from the index before querying the adapter.
Needed for:
Bug: 5203189
Change-Id: Iba7277789ebbd7e3e9954931b1ea06c7e34f3c15
2011-09-29 15:16:16 -07:00
Christopher Tate
b8491bb75f
Enforce DUMP permission on BackupManagerService's dump() method
...
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.
Bug 5389201
Change-Id: If84886357a36b7015878e4d72017abba83b4c511
2011-09-29 15:13:11 -07:00
Philip Milne
a15cb2cda7
Merge "Fix for 5393156"
2011-09-29 15:01:27 -07:00
Kenny Root
b1955c96cc
Merge "Add package-verifier to aapt dump badging"
2011-09-29 15:00:42 -07:00