drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,847 Commits 1 Branch 0 Tags
Commit Graph

64847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
bcf9deedc3 am 3957b5fc: Fix the build. 
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
  Fix the build.
 2011-12-07 13:17:35 -08:00
Robert Greenwalt
3957b5fc49 Fix the build. 
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
 2011-12-07 13:10:59 -08:00
Robert Greenwalt
b47f12d4a1 am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
  Trim leading zeros from ipv4 addrs.
 2011-12-07 12:31:35 -08:00
Robert Greenwalt
f352491aad Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 2011-12-07 12:29:14 -08:00
Irfan Sheriff
5ea9ea6537 am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1 
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
  Fix CS wakelock handling
 2011-12-07 12:08:01 -08:00
Irfan Sheriff
a85cc28229 Merge "Fix CS wakelock handling" into ics-mr1 2011-12-07 12:06:31 -08:00
Bart Sears
3edc62bc35 am b56076ac: Merge "Fix WebTextView rings" into ics-mr1 
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
  Fix WebTextView rings
 2011-12-07 11:43:27 -08:00
Bart Sears
b56076ac9f Merge "Fix WebTextView rings" into ics-mr1 2011-12-07 11:41:57 -08:00
Joe Malin
7659e295a5 am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
  DOC CHANGE: Add Content URI ref doc
 2011-12-07 11:30:11 -08:00
Joe Malin
3744d1faf5 am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
  DOC CHANGE: Add Content URI ref doc
 2011-12-07 11:28:25 -08:00
Irfan Sheriff
87f0a7b1aa Fix CS wakelock handling 
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
 2011-12-07 11:28:21 -08:00
Joe Malin
9e2cf49fa3 Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 2011-12-07 11:26:20 -08:00
Dianne Hackborn
d6c69b7498 am fb90df8c: Merge "Truthiness is good." into ics-mr1 
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
  Truthiness is good.
 2011-12-07 11:04:04 -08:00
The Android Open Source Project
8964779292 am 3de8d36b: Reconcile with ics-mr0-release 
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now
 2011-12-07 11:03:56 -08:00
Irfan Sheriff
d04f28151b am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1 
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
  Disable poor network connection alone
 2011-12-07 11:03:26 -08:00
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
Dianne Hackborn
fb90df8c6e Merge "Truthiness is good." into ics-mr1 2011-12-07 10:33:19 -08:00
Robert Greenwalt
d4420ab2fb Trim leading zeros from ipv4 addrs. 
Underlying libraries will interpret leading zeros as octal values and
fail.

bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
 2011-12-07 09:58: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
The Android Open Source Project
3de8d36b6f Reconcile with ics-mr0-release 
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
 2011-12-07 07:24:54 -08:00
Irfan Sheriff
8a4cd3b105 Merge "Disable poor network connection alone" into ics-mr1 2011-12-06 21:06:03 -08:00
John Reck
8463c88ddf Fix WebTextView rings 
Bug: 5718531
 Don't scroll the rings and fix the border's alpha

Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
 2011-12-06 17:38:57 -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
Irfan Sheriff
19380daaf4 Disable poor network connection alone 
- Keep the walled garden detection in place

Bug: 5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
 2011-12-06 16:21:03 -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
Andreas Huber
81cab1752e DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
 2011-12-06 14:23:38 -08:00
Irfan Sheriff
b87d22b865 Disable wifiwatchdog for now 
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
 2011-12-06 14:23: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