Commit Graph

64822 Commits

Author SHA1 Message Date
Scott Main
beeeceef18 am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
* commit '0a83e9d438f35cba62a10392fb9e7e1c577aa638':
  docs: fix broken links bug: 5542371
2011-12-07 11:03:10 -08:00
Andreas Huber
1742d2ef9d am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
  DO NOT MERGE: Remove the AVI extractor.
2011-12-07 11:03:00 -08:00
Fabrice Di Meglio
fd00f869e9 am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '1e99421196c1b34363267d6e6f02b16a299c9012':
  Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
2011-12-07 11:02:58 -08:00
Hong Teng
ff1e877a8d am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int
* commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
  Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character.  And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
2011-12-07 11:02:53 -08:00
Amith Yamasani
52cb1da2c6 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
2011-12-07 11:02:51 -08:00
Adam Powell
b5014d4754 am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
* commit '720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
  Lower touch slop in ViewConfiguration.
2011-12-07 11:02:38 -08:00
James Dong
b300003a14 am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
2011-12-07 11:02:31 -08:00
Andreas Huber
1b4c8bf697 am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.
2011-12-07 11:02:29 -08:00
Irfan Sheriff
d6b9de6860 am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
  Disable wifiwatchdog for now
2011-12-07 11:02:27 -08:00
Gilles Debunne
a0cb89a201 am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
  Invalidated bounds tightened in TextView
2011-12-07 11:02:25 -08:00
Eric Fischer
bcd96b36d0 am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
  Import revised translations.  DO NOT MERGE
2011-12-07 11:02:01 -08:00
Jason Simmons
a188e4dc0e resolved conflicts for merge of ea25ea7e to ics-aah
Change-Id: I9d387ad2107486406f364f1cebc709126e2d27a5
2011-12-07 10:47:48 -08:00
Jeff Brown
52da507241 am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)
2011-12-07 09:27:41 -08:00
Jim Miller
9a6123f997 am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
2011-12-07 09:27:39 -08:00
Jesse Hall
cca5ae0f65 am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
  Fix statusbar crash on devices with no Bluetooth
2011-12-07 09:27:37 -08:00
Matthew Xie
3d374bd16c am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
  Broadcast turning on/off intent as early as possible when switch on/off BT
2011-12-07 09:27:35 -08:00
Scott Main
0a83e9d438 am b6322a5b: docs: fix broken links bug: 5542371
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
  docs: fix broken links bug: 5542371
2011-12-06 17:12:53 -08:00
Scott Main
b6322a5bb9 docs: fix broken links
bug: 5542371

Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
2011-12-06 17:09:37 -08:00
John Grossman
8e65f17d2b Merge "Tungsten: Improve RX player error handling." into ics-aah 2011-12-06 16:44:04 -08:00
Andreas Huber
791a31832a Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Fabrice Di Meglio
1e99421196 Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 2011-12-06 15:47:27 -08:00
Hong Teng
6db79c35c0 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00
Amith Yamasani
f336408000 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Fabrice Di Meglio
99cdc6a3b5 Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
- disable GSUB / GPOS table loading

Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
2011-12-06 15:31:19 -08:00
Andreas Huber
485d82c5e2 Merge commit 'babb7200' into manualmerge 2011-12-06 15:03:10 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
2011-12-06 14:48:38 -08:00
John Grossman
f998922f30 Tungsten: Improve RX player error handling.
First, clear an issue which was causing an assert to fire.  Basically,
once a decoder pump had entered the error state and was shutdown, it
was not clearing its status, and when a substream attempt to recycle
the pump, startup was failing an assert (no thread had been created,
meaning that the system was not initialized, yet status indicated an
error).  This was a small one-liner in aah_decoder_pump.cpp.

Second, try to become a little nuanced about how we handle errors in
the decoder pump.  A comment in the code pretty much says it all, but
the summary is that we don't want to completely abort playback because
a single chunk of ES failed to decode, but if nothing is decoding and
we are making no progress at all, we probably need to put the
MediaPlayer instance into the fatal Error state and signal the app
level so that further action can be taken (automatic recovery attempts
followed by bug reports and signalling the user if those fail).

This is to address the fallout of http://b/issue?id=5498460, where
something at the OMX decoder level becomes unhappy about not being
able to obtain an output buffer which eventually unwinds to this
assert which results in a dead mediaserver.  After this change, the
mediaserver will no longer crash, and may even recover (depending on
whether or not the OMX unhappiness is transient or not), but the
primary issue (unhappy OMX) is probably still around.  It is quite
difficult to reproduce, I will probably need to open a different bug
to track that issue.

Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837
Signed-off-by: John Grossman <johngro@google.com>
2011-12-06 14:19:31 -08:00
Adam Powell
720efc43d8 Merge "Lower touch slop in ViewConfiguration." into ics-mr1 2011-12-06 13:58:20 -08:00
James Dong
6b8b5a0a41 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Andreas Huber
05d6306911 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 2011-12-06 12:44:53 -08:00
Andreas Huber
babb72006b Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0 2011-12-06 12:11:38 -08:00
Adam Powell
7d39f85acf Lower touch slop in ViewConfiguration.
Our typical touchscreens are now good enough that we don't need the
touch slop to be as large as it once was. Lower it to increase
responsiveness while scrolling.

Move the touch slop constant to the config resource
config_viewConfigurationTouchSlop so that it may be more easily
tweaked in device-specific overlays.

Change-Id: I7c11d8affcb98e91654203beb13a26cfeec18f7c
2011-12-06 12:08:47 -08:00
Hong Teng
96bea6a5e9 Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails
-Correct the invalid filename, which contains control character.
 And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.

Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
2011-12-06 11:51:47 -08:00
Irfan Sheriff
40cb30c2df am 7b62313e: Disable wifiwatchdog for now
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
2011-12-06 11:34:58 -08:00
Andreas Huber
92f604c4d4 DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
2011-12-06 11:24:34 -08:00
Irfan Sheriff
7b62313eab Disable wifiwatchdog for now
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
2011-12-06 11:21:22 -08:00
Andreas Huber
142a04aed5 DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
2011-12-06 11:21:02 -08:00
Gilles Debunne
98a85c2de6 Merge "Invalidated bounds tightened in TextView" into ics-mr1 2011-12-06 11:20:18 -08:00
Jason Simmons
3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah
Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d
2011-12-06 11:11:13 -08:00
Eric Fischer
58ad16cfea Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:34:41 -08:00
Eric Fischer
c92b5c227a Import revised translations. DO NOT MERGE
Change-Id: I1d49a1533bd0481543280a379a9f93bd7027e54a
2011-12-06 10:27:06 -08:00
Svetoslav Ganov
ea25ea7ef3 Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 2011-12-06 10:27:04 -08:00
John Grossman
7dc935ad17 Merge "AudioFlinger: Make StandbyTime configurable." into ics-aah 2011-12-06 10:04:38 -08:00
John Grossman
77e2cf7821 AudioFlinger: Make StandbyTime configurable.
Make the standby time for AudioFlinger configurable using a system
property.  Default AudioFlinger behavior is to go into standby
(allowing the audio outputs to underflow) after there has been nothing
to mix and AudioFlinger has just been pumping out silence for the
configured standby time (which defaulted to 3 seconds).

Now, by setting the "ro.audio.flinger_standbytime_ms" property in
their platform init.rc, platforms can override this default and
control the standby time.  If the property is missing or malformed,
the old default value of 3 seconds will be used instead.

Change-Id: Ic9fa8b5f5bccee493bc72c65e408d3fd8ddd1059
Signed-off-by: John Grossman <johngro@google.com>
2011-12-06 10:02:29 -08:00
Jeff Brown
4079702ac2 Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 2011-12-05 22:50:49 -08:00
Jim Miller
17f9fe13c7 Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 2011-12-05 22:12:54 -08:00
Jesse Hall
3e7b412d7d Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 2011-12-05 21:23:29 -08:00
Jeff Brown
f98c2a67fe Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
Ensure log_clusters array is big enough.
Bug: 5714171

Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Harfbuzz assumes the length of the item is at least 1.
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Bug: 5705479

Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
2011-12-05 20:40:03 -08:00
Matthew Xie
0d9a41e74c Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 2011-12-05 19:56:54 -08:00
Dianne Hackborn
0c0120efa2 Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00