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

44296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
1372f0449b am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread 
* commit '5086c45718a8344fb36adf5b15e98953612cac37':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 18:09:26 -08:00
Justin Ho
7e0f69db6c am b7fa0b65: am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb 
* commit 'b7fa0b65d789464f67b00d5975a9bc26460ce63c':
  Revert "Sounds cleanup"
 2011-02-03 18:09:00 -08:00
Vasu Nori
1b67231483 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 18:08:44 -08:00
Michael Jurka
bb01f8a2d0 am d51e0820: am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit 'd51e0820b3b7a71f2b3e0447bdf05188588c6003':
  adding fast setters for translationx/y
 2011-02-03 18:08:17 -08:00
Romain Guy
8b113cf6d7 am cb2c84fd: am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit 'cb2c84fd81a0891071e8ed0237927ad785751850':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 18:08:03 -08:00
Xavier Ducrohet
795ff6999a am 1ea9930e: am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb 
* commit '1ea9930e74a3b10186b7691060b6e6cf09f73b07':
  LayoutLib: Fix some rendering issues
 2011-02-03 18:07:36 -08:00
Evan Millar
16289de340 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-03 18:07:29 -08:00
Justin Ho
2b413b1d2e am da75a283: am 205bdd4f: Merge "Sounds cleanup" into honeycomb 
* commit 'da75a28304a026634e6583735e525c13a2040239':
  Sounds cleanup
 2011-02-03 18:07:03 -08:00
satok
43c3200280 Merge "Register ENABLED_INPUT_METHODS to SettingsObserver" 2011-02-03 18:07:03 -08:00
Jaikumar Ganesh
b3c4efc22d Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Daniel Sandler
8cd46b577b am 63944f6c: am 2243cca4: Merge "Time to take down the Christmas lights." into honeycomb 
* commit '63944f6c38090e263d824d9c4a074d2baf13a21c':
  Time to take down the Christmas lights.
 2011-02-03 17:19:16 -08:00
Joe Malin
f368c03039 am 64ee4ed4: am 70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb 
* commit '64ee4ed48de701ffa0096e8fb715a604821d6b5e':
  DOC CHANGE: Fix bugs in Installing SDK topic
 2011-02-03 17:19:05 -08:00
Eric Laurent
2e8fbebff4 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb 
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
 2011-02-03 17:18:46 -08:00
Justin Ho
79cce9f445 am 7fbdc7f6: am 8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb 
* commit '7fbdc7f6ecfff38693e4ca337984b591a8560574':
  Adding Iridium as a ringtone
 2011-02-03 17:18:36 -08:00
Daniel Sandler
589a6a3355 am 62362af8: am 81034187: Merge "Move the low battery sound to the notification stream." into honeycomb 
* commit '62362af8f93a44147e27a43c56d3c8da22ae1864':
  Move the low battery sound to the notification stream.
 2011-02-03 17:18:23 -08:00
Dheeraj Sharma
7ee76cfeea am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb 
* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
  Fix for issue :  3419353 Crash during transition generation
 2011-02-03 17:18:13 -08:00
Cary Clark
39530f8fc7 am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
  stop GL drawing thread before killing WebCore
 2011-02-03 17:17:45 -08:00
Justin Ho
9b50aebc60 am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb 
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
  Changing Honeycomb default wallpaper
 2011-02-03 17:17:35 -08:00
Romain Guy
b0905c998d am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb 
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
  Fast transform properties setters. Bug #3413510
 2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb 
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
  Implement priority ordering in notifications.
 2011-02-03 17:16:54 -08:00
Gil Dobjanschi
223f2696bb am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb 
* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
 2011-02-03 17:16:43 -08:00
Joe Onorato
247c0c1bba am 020c021c: am e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb 
* commit '020c021c62f804ed08d89a3a38457a002184158e':
  Add a bluetooth icon and data direction to the status bar.
 2011-02-03 17:16:31 -08:00
Romain Guy
9bd32c235d am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 
* commit '109da7dfd4c0766274b17467880ee673c731735c':
  Allocate layers from the layers pool. Bug #3413433
 2011-02-03 17:16:19 -08:00
Justin Ho
de9fa2cfe0 am a29acdfb: am 1cee14f1: Merge "System bar tweaks" into honeycomb 
* commit 'a29acdfb8a3c9812718ead057f77ef5dbd508682':
  System bar tweaks
 2011-02-03 17:15:33 -08:00
Justin Ho
8e0bf64c6f am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb 
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
  Adding new volume control dialog icons
 2011-02-03 17:15:21 -08:00
Dianne Hackborn
3d80ba0515 am dd954212: am a5861743: Merge "Fix issue #3418265: Rotation animation on wallpaper is broken" into honeycomb 
* commit 'dd95421291f590ec0b1d8e79b73264516e1da027':
  Fix issue #3418265: Rotation animation on wallpaper is broken
 2011-02-03 17:15:04 -08:00
Jean-Michel Trivi
2c7afbe15d am d1488c58: am 17f88656: Fix audible selection sound is not played 
* commit 'd1488c588d796ee0d44235b11510327144be977a':
  Fix audible selection sound is not played
 2011-02-03 17:14:44 -08:00
Jaikumar Ganesh
50b40cec9c Wait till SDP records are registered before sending intent. 
Wait till all SDP records are registered, before sending STATE_ON intent.
This would fix crashes in Settings app when the profile manager
is not registered.
Problem:
  We were sending Bluetooth State on intent before we got the uuid state
  change intent from Bluez, which is asynchronous.
  Hence when the Settings app queries for the profiles
  to decide if headset profile was registered it would get false and
  the profile manager would be null causing crashes.
  This was not 100 % reproducible, well because it was a race condition.

Change-Id: I791eb63dfbc78aba4c06fd8db933069cb5fde00d
 2011-02-03 17:02:06 -08:00
Scott Main
f37f7065a5 Merge "docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:" 2011-02-03 16:57:36 -08:00
Andreas Huber
792faa453a Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)" 2011-02-03 16:19:59 -08:00
Andreas Huber
1122fe90f2 Merge "Make sure timestamps attached to encoded media are composition timestamps." 2011-02-03 16:19:30 -08:00
Andreas Huber
e7c83d4a71 Make AwesomePlayer's reset process more verbose to track down ANRs (yet again) 
Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
 2011-02-03 16:09:57 -08:00
Andreas Huber
bd352c3cdc Make sure timestamps attached to encoded media are composition timestamps. 
not decoding timestamps. Obviously there is no difference between them if the
content in question does not involve frame reordering.

Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893
related-to-bug: 3398314
 2011-02-03 16:08:30 -08:00
Jack Palevich
c33bf55c09 Merge "Throw an exception when trying to upload a recycled bitmap." 2011-02-03 15:25:52 -08:00
Robert Greenwalt
23a8a45928 Merge "Stop using netmask in the framework." 2011-02-03 14:16:45 -08:00
Glenn Kasten
2b5072405b Merge "Bug 1804058 FLAC extractor" 2011-02-03 14:06:09 -08:00
Glenn Kasten
f9f223edb4 Bug 1804058 FLAC extractor 
Note: dependent on external/flac for libFLAC

Implemented and tested:
 * FLAC container
 * mono and stereo
 * standard sample rates
 * standard bit depths
 * sniffer
 * media scanner
 * Vorbis comment metadata including album art
 * random access seeking with "torture test"
 * web browser integration for audio/flac (not audio/x-flac), but
   note that most web servers don't correctly report the MIME type

Not implemented:
 * 24-bit to 16-bit dither or noise shaping in AudioFlinger
 * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger
 * replay gain is better done in AudioFlinger
 * multi-channel, would need AudioFlinger support
 * Ogg container, does not seem to be very popular yet

Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
 2011-02-03 13:39:10 -08:00
Robert Greenwalt
2d2afd13af Stop using netmask in the framework. 
bug:2542681
Change-Id: Iaa2b30f7a43de28844d86a4a8a513e86d719608a
 2011-02-03 13:20:00 -08:00
Robert Greenwalt
f8d40f0d55 Merge "Bind addr and prefixLength together in LinkAddress" 2011-02-03 13:17:48 -08:00
Jean-Baptiste Queru
5086c45718 am baaaca1c: Merge ee4c17ee from gingerbread 
* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:12:35 -08:00
Jean-Baptiste Queru
baaaca1c61 Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3 Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Justin Ho
b7fa0b65d7 am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb 
* commit 'ef36255f876aa1a61dcf5e879f4380887dda3854':
  Revert "Sounds cleanup"
 2011-02-03 12:38:26 -08:00
Justin Ho
ef36255f87 Merge "Revert "Sounds cleanup"" into honeycomb 2011-02-03 12:35:51 -08:00
Vasu Nori
9ec496b484 am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 12:24:59 -08:00
Marco Nelissen
770d02c2fa Unhide MediaStore.getVersion so Music2 can use it. 
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
 2011-02-03 12:23:40 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
This reverts commit 6bc710f769618e87b98d51cd02241e6b1a2fb653, reversing
changes made to 7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a.
 2011-02-03 12:20:31 -08:00
Jean-Baptiste Queru
2703b84caa Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Daniel Sandler
c53867926e Revert "Sounds cleanup" 
This reverts commit b04c57ba980793c43b79c9d889e94e3cd164e8ad.
 2011-02-03 15:06:32 -05:00
Michael Jurka
d51e0820b3 am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
  adding fast setters for translationx/y
 2011-02-03 12:02:37 -08:00