1152 Commits

Author SHA1 Message Date
Jean-Michel Trivi
1155efdc71 am 2ba92c71: do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Dharmaray Kundargi
7a58635e84 am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
  Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
666b9eb3a2 am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
  Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
9c077e44c0 Overlay java files Issue 3370836
Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
2011-01-26 11:35:29 -08:00
Jean-Michel Trivi
2ba92c71b5 do not merge bug 3370834 Cherrypick from master
Cherripick from master CL 79833, 79417, 78864, 80332, 87500

Add new audio mode and recording source for audio communications
 other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
 call is currently underway. There was no way for audio video
 chat or VoIP applications to signal a call is underway, but not
 using the telephony resources. This change introduces a new mode
 to address this. Changes in other parts of the system (java
 and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
 state variable directly, but to use two new convenience methods,
 isInCall() and isStateInCall(int) instead.

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Update the platform-independent audio policy manager to pass the
 nature of the audio recording source to the audio policy client
 interface through the AudioPolicyClientInterface::setParameters()
 method.

SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
 Audio mode MODE_IN_CALL is reserved for telephony.

SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.

Note that this CL is intentionally not correcting the
 getAudioSourceMax() return value in MediaRecorder.java as the
 new source is hidden here.

Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
2011-01-26 11:20:01 -08:00
Santosh Madhava
ae27549f83 am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
* commit 'c4132eb299d52575c3a5f4a9361f62f1737ad64e':
  Review rework for issue 3385068 : Play gets out of sync
2011-01-25 22:48:57 -08:00
Santosh Madhava
c4132eb299 am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
* commit '4991a00b28ea17941681396ec5dfc62a53408158':
  Review rework for issue 3385068 : Play gets out of sync
2011-01-25 22:46:41 -08:00
Santosh Madhava
4991a00b28 Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 22:44:07 -08:00
Santosh Madhava
3cf1554b76 am 7196a266: am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb
* commit '7196a266c5967f64a858519c5fe71f0964035390':
  Fix for issue 3366265 : Native crash exporting movie
2011-01-25 22:24:21 -08:00
Santosh Madhava
7196a266c5 am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb
* commit 'b38ed1af92c6af03249a50fed0530d20de5cd14d':
  Fix for issue 3366265 : Native crash exporting movie
2011-01-25 22:21:42 -08:00
Santosh Madhava
1abe0050fa Fix for issue 3366265 : Native crash exporting movie
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
2011-01-25 20:41:55 -08:00
Santosh Madhava
de412d277c Review rework for issue 3385068 : Play gets out of sync
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
2011-01-25 20:22:41 -08:00
Mike Lockwood
501e52f09d am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
  MTP: Fix race conditions in MtpServer JNI code
2011-01-25 16:20:50 -08:00
Santosh Madhava
4a39e8ad70 am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
* commit 'd645172123f6aac530986ede22fae13f647ccb9f':
  Fix for issue 3385068 : Play gets out of sync
2011-01-25 16:19:17 -08:00
Mike Lockwood
7fadb5e77f am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
  MTP: Fix race conditions in MtpServer JNI code
2011-01-25 15:45:48 -08:00
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -08:00
Mike Lockwood
071b2b6739 MTP: Fix race conditions in MtpServer JNI code
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:10:31 -08:00
Santosh Madhava
d645172123 am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
  Fix for issue 3385068 : Play gets out of sync
2011-01-25 14:48:28 -08:00
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Jaikumar Ganesh
da6e64a6b4 am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
  Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:07:12 -08:00
Jaikumar Ganesh
e4d494b495 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:00:32 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Jaikumar Ganesh
dde68c64fd Rename virtual call API to ScoUsingVirtualCall.
This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
2011-01-25 13:49:35 -08:00
Santosh Madhava
a6714ce2bb Fix for issue 3385068 : Play gets out of sync
Change-Id: Iaf5e2f246b9cbfc5c8093d34ed085fe255ae500b
2011-01-25 13:15:43 -08:00
Brad Fitzpatrick
23b802f65b am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
  Avoid using String.format in MediaRecorder
2011-01-25 10:50:59 -08:00
Brad Fitzpatrick
28ae70ceac am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '23a813e17d94083c24a34559864722c809b4e0f7':
  Avoid using String.format in MediaRecorder
2011-01-25 10:48:05 -08:00
Dheeraj Sharma
244d6d3c8b am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycomb
* commit '08902803458faa74fd9aeaec2d9de35046912ed0':
  Issue no : 3370622
2011-01-24 23:09:22 -08:00
Dheeraj Sharma
1ac760afab Issue no : 3370622
VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
2011-01-24 22:52:40 -08:00
Santosh Madhava
5386fd8077 am a1ec9893: am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb
* commit 'a1ec9893b8fd2aa0e499261323d9fe7ad115d915':
  Review rework on Patch Set 2 for issue 3372849
2011-01-24 22:45:57 -08:00
Santosh Madhava
9c0bd864a3 Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb 2011-01-24 22:33:44 -08:00
Santosh Madhava
6bcbb3bd09 Review rework on Patch Set 2 for issue 3372849
Change-Id: I3c077f3318e44035e8ea6eb160d0024e77aaa710
2011-01-24 22:10:19 -08:00
Wu-cheng Li
d5369d8a68 am 1ab0ac3f: am c8de291e: Merge "Improved conversion accuracy of exif geotag data" into honeycomb
* commit '1ab0ac3f17e52d6cf4f23598f76a8fa8af2310d8':
  Improved conversion accuracy of exif geotag data
2011-01-24 19:02:45 -08:00
Wu-cheng Li
c8de291ee5 Merge "Improved conversion accuracy of exif geotag data" into honeycomb 2011-01-24 18:48:34 -08:00
James Dong
33bdc67892 am 73b38938: am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb
* commit '73b38938a5397c1f89702d4dac00e2f52dc264a8':
  Reduce the JNI native method visibility
2011-01-24 17:17:01 -08:00
James Dong
98dcca909a Reduce the JNI native method visibility
bug -3385135

Change-Id: I568b53d2279622b44ca5b8a23a8691ca3395f9a5
2011-01-24 15:56:11 -08:00
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Santosh Madhava
01a9c0289e am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb
* commit '47254778584db8d7a8b9ff17e3704fbdf18fa348':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
2011-01-24 13:30:54 -08:00
Gil Dobjanschi
dc5b1762da am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb
* commit '6c170eccf2864e526a145c91102b204cb787c860':
  VideoEditor:Clear Surface API addition
2011-01-24 13:27:07 -08:00
Santosh Madhava
4ff8a0b410 Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
2011-01-24 10:17:05 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00
Dheeraj Sharma
05d9f81bd6 VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
Oscar Rydhe
a113a075ca Improved conversion accuracy of exif geotag data
Changed degrees and minutes of geotag data into double to avoid
data loss during cast.

Also improved error handling if geotag data can't be parsed.

bug:3381761
Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
2011-01-24 12:52:07 +08:00
Mike Lockwood
47063a859a Merge "New APIs for MTP and PTP host support" 2011-01-22 15:59:28 -08:00
Mike Lockwood
8182e72479 New APIs for MTP and PTP host support
This replaces the previous ContentProvider based interface

Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 15:56:09 -08:00
Mike Lockwood
f26a586c86 Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-21 21:00:54 -08:00
Santosh Madhava
9d5ca4a14c Fix for issue 3370052 : Export progress percentage is incorrect
Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
2011-01-20 17:10:40 -08:00
Santosh Madhava
bdb2e79a41 Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
2011-01-20 14:52:06 -08:00
Gil Dobjanschi
c4edeb5a60 Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
2011-01-19 14:10:32 -08:00
Mike Lockwood
2bc6971dd8 Merge changes I7df1ff78,Ibc2e8adf into honeycomb
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:30:13 -08:00
Mike Lockwood
242d0cdc1a MediaScanner: Make sure name field is set for file based playlists
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:29:08 -08:00