203 Commits

Author SHA1 Message Date
Android (Google) Code Review
2387208c9e am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
  Use a ref-counted callback interface for Camera.
2009-06-24 13:54:09 -07:00
Android (Google) Code Review
567c2e22aa am 9efba9d2: Merge change 5176 into donut
Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9'

* commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9':
  Export the output to a text file and save to sdcard
2009-06-24 13:12:37 -07:00
Nicolas Catania
20cb94eeb5 Direct api to the native media player.
MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
  native player using invoke.
* invoke issues synchronous calls to the native player using opaque
  parcels for the request and reply.

IMediaPlayer.h has 1 new abstract method:
* invoke

The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.

To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).

The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
 IMediaPlayer.cpp (proxy). No extra copy is needed there.
2009-06-24 08:22:52 -07:00
Dave Sparks
5e27115995 Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
2009-06-24 07:58:27 -07:00
Android (Google) Code Review
9efba9d29f Merge change 5176 into donut
* changes:
  Export the output to a text file and save to sdcard
2009-06-23 19:51:00 -07:00
Yu Shan Emily Lau
f16da13585 Export the output to a text file and save to sdcard 2009-06-23 19:36:43 -07:00
Android (Google) Code Review
cf01aa3cff am 1bee98af: Merge change 5100 into donut
Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7'

* commit '1bee98af6532eba3c6cda636eee890530c95a2a7':
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:42:41 -07:00
Android (Google) Code Review
1bee98af65 Merge change 5100 into donut
* changes:
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:38:34 -07:00
Android (Google) Code Review
6922f19d30 am 843f5eb3: Merge change 5054 into donut
Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54'

* commit '843f5eb36a67367ae76800f74e184f00af50ef54':
  Rollback the number of loop in the memory stress test
2009-06-23 13:08:18 -07:00
David Krause
b6d90ca129 Fill in CDMA gaps and clean up ToneGenerator code 2009-06-23 12:32:12 -07:00
Yu Shan Emily Lau
327420252c Rollback the number of loop in the memory stress test 2009-06-22 21:19:53 -07:00
Android (Google) Code Review
949070dd74 am 11348cff: Merge change 4885 into donut
Merge commit '11348cffef46585027ba3035357370177a554826'

* commit '11348cffef46585027ba3035357370177a554826':
  Merge the output file into one.
2009-06-22 19:47:35 -07:00
Yu Shan Emily Lau
a74603052b Merge the output file into one. 2009-06-22 14:50:25 -07:00
niko
dcd810d013 Renamed all android.hardware.IMedia* strings to android.media.IMedia*
The android.hardware.ICamera string have not been changed (but is looks
like the camera service and client one should undergo the same procedure)

The implementation of the interface must provide a unique string for
it's interface name. Currently all these strings in the media framework
start with 'android.hardware' when it should really be 'android.media',
the interface token has nothing to do with hardware.
2009-06-22 09:08:19 -07:00
Android (Google) Code Review
a877427e2f am 0e3d77af: Merge change 4324 into donut
Merge commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6'

* commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6':
  AudioService: Fix routing problem recently introduced in setRouting().
2009-06-16 08:37:50 -07:00
Mike Lockwood
d1f362fe14 AudioService: Fix routing problem recently introduced in setRouting().
Do not disable a route unless routes is zero, to avoid accidentally disabling
if the same route is enabled twice in a row.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-16 08:23:13 -04:00
Android (Google) Code Review
cca860fa6b am 3d4b7065: Merge change 4047 into donut
Merge commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5'

* commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5':
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 11:43:59 -07:00
Android (Google) Code Review
5f80742306 am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'

* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
  Removed trailing whitespaces.
2009-06-12 11:43:55 -07:00
Android (Google) Code Review
3d4b7065e9 Merge change 4047 into donut
* changes:
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 08:33:59 -07:00
Eric Laurent
9bcf401d13 Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
The problem is that setRingerModeInt() does not handle streams not affected by ringer mode: when enabling "Alarm in silent mode" while in silent mode, setRingerModeInt is called after alarm streamis removed from ringer mode affected streams, and nothing is done.

The fix constists in also processing streams that are not affected by ringer mode and to restore last audible volume for them. It does not arm reapplying the volume for streams the are never affected by ringer mode as we don't do this very often.

The other problem noted in the bug report (ringer volume always restored to non zero value when exiting silent mode even if set to zero before) is also fixed: a new parameter is added to setIndex() and setStreamVolumeInt() to explicitely request to store the volume index as last audible instead of doing it automatically if index > 0.
2009-06-12 06:09:28 -07:00
Nicolas Catania
32f8277488 Removed trailing whitespaces. 2009-06-11 16:54:48 -07:00
Android (Google) Code Review
1ecb750f65 am 1d7d5db7: Merge change 3799 into donut
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'

* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
  Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:20:04 -07:00
Android (Google) Code Review
1d7d5db74f Merge change 3799 into donut
* changes:
  Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:10:05 -07:00
Yu Shan Emily Lau
afbc17ead2 Turned on the windows media related test cases as the binary already integrated. 2009-06-10 15:46:32 -07:00
Android (Google) Code Review
9da6971d8a am faf41044: Merge change 3644 into donut
Merge commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b'

* commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b':
  Print a message to the log when a file can't be opened on the client side.
2009-06-09 20:45:59 -07:00
Marco Nelissen
a2df60598a Print a message to the log when a file can't be opened on the client side. 2009-06-09 15:49:23 -07:00
Android (Google) Code Review
f5b746e157 am b2df1699: Merge change 1548 into donut
Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194'

* commit 'b2df1699c996e62baa78877978cd2c5607ea4194':
  NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
2009-06-08 16:00:19 -07:00
Android (Google) Code Review
b2df1699c9 Merge change 1548 into donut
* changes:
  NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
2009-06-08 15:58:21 -07:00
Android (Google) Code Review
8c09399490 am bdf90a08: Merge change 3462 into donut
Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3'

* commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3':
  Capture the memory output before the playback and record start.
2009-06-08 11:59:12 -07:00
Yu Shan Emily Lau
32e959163f Capture the memory output before the playback and record start. 2009-06-08 11:29:55 -07:00
Jianhong Jiang
2bcda90c02 NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC). 2009-06-08 08:50:42 -07:00
Android (Google) Code Review
7c49790cde am 162c9d0e: Merge change 2805 into donut
Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47'

* commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47':
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 10:01:08 -07:00
Android (Google) Code Review
162c9d0e90 Merge change 2805 into donut
* changes:
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 09:58:44 -07:00
Android (Google) Code Review
4599184a1c am 450ad31b: Merge change 2774 into donut
Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e'

* commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e':
  Limit check on maxChannels for SoundPool.
2009-06-01 09:58:43 -07:00
Android (Google) Code Review
450ad31b62 Merge change 2774 into donut
* changes:
  Limit check on maxChannels for SoundPool. Bug 1838724
2009-06-01 09:57:24 -07:00
San Mehat
5a3a77dabd base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
Signed-off-by: San Mehat <san@google.com>
2009-06-01 09:25:28 -07:00
Dave Sparks
3c8704b171 Limit check on maxChannels for SoundPool.
Bug 1838724
2009-06-01 08:16:19 -07:00
Mathias Agopian
3b4062eeb0 get rid of utils.h 2009-05-31 19:13:00 -07:00
Android (Google) Code Review
27b3eaf4de 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
0f5179c7d3 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
Dave Sparks
8b0b174198 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 13:51:38 -07:00
Android (Google) Code Review
a70396cd0a 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
f6355e24f5 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
b86204a73d 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
Yu Shan Emily Lau
01c0596b75 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 18:59:33 -07:00
Wink Saville
dda5391d50 Motorola additions for CDMA support without CdmaSuppConnTracker
There are corresponding changes to hardware/ril and packages/apps/Phone
that are required to go with these changes.
2009-05-28 17:32:34 -07:00
Android (Google) Code Review
7e432e0c68 am f3288f17: Merge change 2468 into donut
Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'

* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
  setVolume did not check interface descriptor
2009-05-26 16:25:36 -07:00
Mathias Agopian
aaf834a284 some work to try to reduce the code size of some native libraries
- make sure that all binder Bn classes define a ctor and dtor in their respective library.
  This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.
  This is also cleaner, should we want these ctor/dtor to do something one day.

- same change as above for some Bp classes and various other non-binder classes

- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.

- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere

- IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16

- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.
  The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
2009-05-26 16:12:20 -07:00
Dave Sparks
814941997f setVolume did not check interface descriptor
DO NOT MERGE
2009-05-26 14:39:29 -07:00
Android (Google) Code Review
c5d0343b67 am de8268d6: Merge change 2331 into donut
Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'

* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
  Fix issue 1846343 - part 1
2009-05-26 10:11:44 -07:00