Commit Graph

1168 Commits

Author SHA1 Message Date
Android (Google) Code Review
7477657d60 am 2d75410f: Merge change 2748 into donut
Merge commit '2d75410f20653858f358237ae9bd09b053fe8f8f'

* commit '2d75410f20653858f358237ae9bd09b053fe8f8f':
  Fix the build.
2009-05-29 15:04:50 -07:00
Android (Google) Code Review
e1695e5e27 Merge change 2748 into donut
* changes:
  Fix the build.
2009-05-29 15:03:25 -07:00
Android (Google) Code Review
c20e4ebef2 am b61ae351: Merge change 2747 into donut
Merge commit 'b61ae351256518add7bcb40e0bf18337dd87195c'

* commit 'b61ae351256518add7bcb40e0bf18337dd87195c':
  log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
2009-05-29 14:57:33 -07:00
Android (Google) Code Review
489d3953f0 Merge change 2747 into donut
* changes:
  log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
2009-05-29 14:55:48 -07:00
Mathias Agopian
3c4d8c83da log the geomerty of surfaces causing an out of memory in SurfaceFlinger. 2009-05-29 14:55:06 -07:00
Android (Google) Code Review
c61218f33f am a5f50b8f: Merge change 2746 into donut
Merge commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978'

* commit 'a5f50b8f49cc9b34b1de462e11498d92c692b978':
  Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
2009-05-29 14:47:16 -07:00
Android (Google) Code Review
811eeff577 Merge change 2746 into donut
* changes:
  Modify the base gestures API to use streams instead of files. Adds new wrappers to easily load/save gestures from files, resources, etc. Do the same for the letters recognizer.
2009-05-29 14:46:02 -07:00
Android (Google) Code Review
3d6cbbd342 am 0f5179c7: Merge change 2716 into donut
Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db'

* commit '0f5179c7d333ddab729b5943766637c21d1b74db':
  Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
2009-05-29 14:18:55 -07:00
Android (Google) Code Review
f93f7a3844 Merge change 2716 into donut
* changes:
  Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
2009-05-29 14:17:44 -07:00
Android (Google) Code Review
926518e523 am 7a8c4377: Merge change 2737 into donut
Merge commit '7a8c437723a50b171d0cd97cb17886b28dffce92'

* commit '7a8c437723a50b171d0cd97cb17886b28dffce92':
  Fixes #1878499.
2009-05-29 13:56:39 -07:00
Android (Google) Code Review
5dc682f697 Merge change 2737 into donut
* changes:
  Fixes #1878499.
2009-05-29 13:54:39 -07:00
Android (Google) Code Review
6b633aae0d am d1353cc4: Merge change 2731 into donut
Merge commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465'

* commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465':
  Fixes #1873537.
2009-05-29 13:45:23 -07:00
Android (Google) Code Review
8b0c666c50 Merge change 2731 into donut
* changes:
  Fixes #1873537.
2009-05-29 13:43:57 -07:00
Android (Google) Code Review
0974b9449f am 9d981343: Merge change 2732 into donut
Merge commit '9d981343c9d187b4746ed1f3658224d9551d51c8'

* commit '9d981343c9d187b4746ed1f3658224d9551d51c8':
  Fix for #1878497.
2009-05-29 12:31:08 -07:00
Android (Google) Code Review
f2ab9a4a1c Merge change 2732 into donut
* changes:
  Fix for #1878497.
2009-05-29 12:29:17 -07:00
Android (Google) Code Review
c5b5e5c545 am ecad93e5: Merge change 2685 into donut
Merge commit 'ecad93e5f3c7345febcfa078b1d2aa00a2e1fd66'

* commit 'ecad93e5f3c7345febcfa078b1d2aa00a2e1fd66':
  Change code coverage to write to app data folder rather than sdcard.
2009-05-29 12:20:52 -07:00
Android (Google) Code Review
10b5a2d03a Merge change 2685 into donut
* changes:
  Change code coverage to write to app data folder rather than sdcard.
2009-05-29 12:19:34 -07:00
Android (Google) Code Review
c91a411ffd am a3d28bd5: Merge change 520 into donut
Merge commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01'

* commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01':
  Enforce permissions for PhoneStateListener events.
2009-05-29 11:49:36 -07:00
Android (Google) Code Review
41095a2d85 Merge change 520 into donut
* changes:
  Enforce permissions for PhoneStateListener events.
2009-05-29 11:48:34 -07:00
Romain Guy
4480e1bb5d am e32edc61: Fixes #1884152. This change improves how the opaque property is handled with respect to dividers.
Merge commit 'e32edc614e62ac874a969d3cc6bb1e0c0c3f2607'

* commit 'e32edc614e62ac874a969d3cc6bb1e0c0c3f2607':
  Fixes #1884152. This change improves how the opaque property is handled with respect to dividers.
2009-05-29 11:41:21 -07:00
Android (Google) Code Review
e5eb06d98b am d9cc7659: Merge change 2706 into donut
Merge commit 'd9cc7659fa9b8544e2a3ca7b7040fbd79afdf7ea'

* commit 'd9cc7659fa9b8544e2a3ca7b7040fbd79afdf7ea':
  Fix issue 1883666: Audio coming from the music player stopped suddenly
2009-05-29 09:42:26 -07:00
Android (Google) Code Review
52192700a7 Merge change 2706 into donut
* changes:
  Fix issue 1883666: Audio coming from the music player stopped suddenly
2009-05-29 09:40:23 -07:00
Bjorn Bringert
d87acc2228 am 761e0918: Unmap memory in MemoryFile.close().
Merge commit '761e0918d30b6a3f292625b44b86dffd1538bc78'

* commit '761e0918d30b6a3f292625b44b86dffd1538bc78':
  Unmap memory in MemoryFile.close().
2009-05-29 06:48:43 -07:00
Eric Laurent
01c4ba3563 Fix issue 1883666: Audio coming from the music player stopped suddenly
The problem comes from the code handling the automatic change of audio routing to speaker when notifications are played. The music is also muted while the sound is forced to speaker.
To avoid truncating the end of the notification, a delay is inserted between the end of the notification and the restoration of the audio routing.  If a new notification starts during this delay, the current music mute state read and saved before muting music corresponds to the forced mute due to previous notification. When the new notification ends, the mute state restored is muted and music stream stays muted for ever.

The fix consists in reading and saving music mute state only if the audio routing has been restored (check that mForcedRoute is back to 0).
2009-05-29 02:03:21 -07:00
Bjorn Bringert
6be8b501e3 am 9fc2e9c9: MemoryFile constructor and native methods throw IOExceptions.
Merge commit '9fc2e9c965c68d56a0caf812f7f6d38d15317063'

* commit '9fc2e9c965c68d56a0caf812f7f6d38d15317063':
  MemoryFile constructor and native methods throw IOExceptions.
2009-05-29 01:12:09 -07:00
Android (Google) Code Review
29446b118f am 607384d4: Merge change 2678 into donut
Merge commit '607384d45fae5c9c2b21c96e4278665c8d7d3006'

* commit '607384d45fae5c9c2b21c96e4278665c8d7d3006':
  Converted the angle of OrientedBoundingBox to degrees
2009-05-28 21:15:06 -07:00
Romain Guy
004bf4d48c am f40f074c: Revert "Revert "Bug fixes and performance improvements""
Merge commit 'f40f074c43fcef627131d4b631251192761b4daa'

* commit 'f40f074c43fcef627131d4b631251192761b4daa':
  Revert "Revert "Bug fixes and performance improvements""
2009-05-28 21:15:04 -07:00
Android (Google) Code Review
ce3647052d Merge change 2678 into donut
* changes:
  Converted the angle of OrientedBoundingBox to degrees
2009-05-28 21:13:26 -07:00
Android (Google) Code Review
409e1c59a1 am f6355e24: Merge change 2399 into donut
Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90'

* commit 'f6355e24f5382356ea197135fdeff827aabfdb90':
  Motorola additions for CDMA support without CdmaSuppConnTracker
2009-05-28 20:30:45 -07:00
Android (Google) Code Review
d9a8a156da Merge change 2399 into donut
* changes:
  Motorola additions for CDMA support without CdmaSuppConnTracker
2009-05-28 20:29:10 -07:00
Android (Google) Code Review
1e0f3e437d am 2af7e639: Merge change 2654 into donut
Merge commit '2af7e639906981b1562f3187a60b6c848b7da17c'

* commit '2af7e639906981b1562f3187a60b6c848b7da17c':
  Added the two validations for the memory stress test
2009-05-28 19:08:44 -07:00
Android (Google) Code Review
af2a17ce91 Merge change 2654 into donut
* changes:
  Added the two validations for the memory stress test 1) Set the maximum memory leakage to 150K in 200 loops of playback. 2) Check the pid of the meidaserver.
2009-05-28 19:06:47 -07:00
Android (Google) Code Review
560cbe8b29 Merge change 2669
* changes:
  Implement sampler GL setup code.
2009-05-28 16:43:48 -07:00
Android (Google) Code Review
e863798437 Merge change 2668
* changes:
  Add sampler support
2009-05-28 16:43:29 -07:00
Android (Google) Code Review
d15cf896e1 Merge change 2652
* changes:
  Move ContactsContract.java and SocialContract.java into android.providers
2009-05-28 16:39:00 -07:00
Android (Google) Code Review
e2470f98c8 Merge change 2658
* changes:
  Delete the acc script when deleting the Renderscript rsScriptC object.
2009-05-28 15:55:52 -07:00
Android (Google) Code Review
b2babe4c3f Merge change 2657
* changes:
  Remove versions of scriptCSetScript method that take byte arrays.
2009-05-28 15:55:24 -07:00
Android (Google) Code Review
7193f40bc0 am 1e2e44e9: Merge change 2365 into donut
Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'

* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
  Fix wifi multicast API for public use.
  Revert "Bug fixes and performance improvements"
2009-05-28 14:34:28 -07:00
Android (Google) Code Review
a4ad37c2c7 Merge change 2365 into donut
* changes:
  Fix wifi multicast API for public use.
2009-05-28 14:02:39 -07:00
Android (Google) Code Review
3941a9f52d Merge change 2637 into donut
* changes:
  Revert "Bug fixes and performance improvements"
2009-05-28 13:45:20 -07:00
Android (Google) Code Review
b9dd8d9a91 Merge change 2636
* changes:
  Add support for setting scripts, rather than having a hard-coded script.
2009-05-28 13:44:49 -07:00
Dirk Dougherty
971df80249 am 1cb62b83: am 2542c0a8: AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack. BUG=1877969
Merge commit '1cb62b83241c5d1cac9e9cda60d0d5d9218b44fb'

* commit '1cb62b83241c5d1cac9e9cda60d0d5d9218b44fb':
  AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack.
2009-05-28 12:36:39 -07:00
Romain Guy
6cd8878f50 am b0ded43d: Uninstalls the gestures overlay when the letters recognizer cannot be loaded instead of simply dismissing the popup. This is cleaner and reuses the setGestures() method.
Merge commit 'b0ded43d3844d9d97c5d554e8ca4ec3ee2c7bbe1'

* commit 'b0ded43d3844d9d97c5d554e8ca4ec3ee2c7bbe1':
  Uninstalls the gestures overlay when the letters recognizer cannot be loaded instead of simply dismissing the popup. This is cleaner and reuses the setGestures() method.
2009-05-28 12:31:48 -07:00
Android (Google) Code Review
bed6079023 am 401bbb05: Merge change 2593 into donut
Merge commit '401bbb0597a9f6bc9d752437e81f3f0c9b457b86'

* commit '401bbb0597a9f6bc9d752437e81f3f0c9b457b86':
  Bug fixes and performance improvements
2009-05-28 12:31:44 -07:00
Dirk Dougherty
f4a2188a4e am 2542c0a8: AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack. BUG=1877969
Merge commit '2542c0a805b144b4c4324a749574d9ba76660557' into donut

* commit '2542c0a805b144b4c4324a749574d9ba76660557':
  AI 149346: Replace icon_templates-v1.0.zip with new archive from cnesladek. remove mac-specific files, fix dir name, repack.
2009-05-28 12:30:33 -07:00
Android (Google) Code Review
019c23dc39 Merge change 2574
* changes:
  Sim-only files move, part 2/2.
2009-05-28 11:13:18 -07:00
Android (Google) Code Review
8e6ba9bdd5 Merge change 2525
* changes:
  add onPause and onResume apis, to inform the view when it can pause its activities associated with the DOM.
2009-05-28 05:00:01 -07:00
Android (Google) Code Review
d290ad47a2 Merge change 2593 into donut
* changes:
  Bug fixes and performance improvements
2009-05-27 21:26:31 -07:00
Andy McFadden
da416411e0 Sim-only files move, part 2/2.
Move Pipe and executablepath from libutils to the simulator, since nothing
else uses them.
2009-05-27 16:01:39 -07:00
Android (Google) Code Review
a9d6dd21bc am 145c989c: Merge change 2569 into donut
Merge commit '145c989cafe72d99af120044fed256ac2f982568'

* commit '145c989cafe72d99af120044fed256ac2f982568':
  Fix a hang during bootup.
2009-05-27 16:01:09 -07:00