Jean-Michel Trivi
28817de4d7
am 965f22ba: am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
...
* commit '965f22ba325ea488034174bf76194470a6f0ee52':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
2011-01-27 18:18:17 -08:00
Jean-Michel Trivi
965f22ba32
am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb
...
* commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
2011-01-27 18:15:39 -08:00
Jean-Michel Trivi
834662d422
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
...
When the user is in a phone or VoIP call, the volume keys should
control the STREAM_VOICE_CALL volume. Before MODE_IN_COMMUNICATION
was introduced to cover VoIP use cases, having an active VoIP call
was determined by checking whether there was any track used the
output stream STREAM_VOICE_CALL, which can give false positives.
This CL checks instead against the audio mode to see if
MODE_IN_COMMUNICATION is selected to determine if a VoIP call
is in progress.
This implies that applications that play on STREAM_VOICE_CALL
shouldn't rely on that fact alone to expect the volume keys
to control the STREAM_VOICE_CALL volume, and should instead,
rely on the official mechanism for that:
android.app.Activity.setVolumeControlStream(int)
Change-Id: Ia487951ea1684477aa3d522c9031fad484d8a40d
2011-01-27 17:54:13 -08:00
Santosh Madhava
05b536e671
am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
...
* commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03':
Fix for issue 3370007 Overlay transparency in Java
2011-01-27 16:04:44 -08:00
Santosh Madhava
c4f5b71204
am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
...
* commit '270cbcc16a72f982d84afeb5e3fd3f166936394a':
Fix for issue 3370007 Overlay transparency in Java
2011-01-27 16:02:59 -08:00
Santosh Madhava
270cbcc16a
Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
2011-01-27 16:00:15 -08:00
Basavapatna Dattaguru
4f54da9629
am b408c3e9: am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
...
* commit 'b408c3e984dbc3af43befc6fd16ff74dd24457a9':
Fix Issue: 3373525: reduces app. 100mS in create
2011-01-27 15:12:16 -08:00
Basavapatna Dattaguru
b408c3e984
am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
...
* commit '64a2c359aeda59e4bc43d48f31ade919e918ea26':
Fix Issue: 3373525: reduces app. 100mS in create
2011-01-27 15:03:36 -08:00
Santosh Madhava
73f376cf64
Fix for issue 3370007 Overlay transparency in Java
...
Change-Id: I68be6f56ad58672a771485a028fc0cd8a0514e8a
2011-01-27 14:03:34 -08:00
Basavapatna Dattaguru
64a2c359ae
Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
2011-01-27 13:54:52 -08:00
Basavapatna Dattaguru
737bd08db0
Fix Issue: 3373525: reduces app. 100mS in create
...
Updated by removing code duplication
Updated with review comments
Change-Id: I57a596ed09d4d543964059e18a86e143108305ec
2011-01-27 12:24:19 -08:00
Gil Dobjanschi
6adcce8a57
am 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
* commit '0966fb9e73345b1e5ea9464e77beed07378edd6a':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
2011-01-27 10:36:33 -08:00
Gil Dobjanschi
0966fb9e73
am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
2011-01-27 10:34:39 -08:00
Gil Dobjanschi
eea200a96a
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
Change-Id: Ib7cb994e995d934cf896b856da462c9240fcb5f0
2011-01-27 09:51:46 -08:00
James Dong
d4d138a064
am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
Eliminate duplicated code in export method
2011-01-26 21:20:16 -08:00
James Dong
f1e687b6e3
am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
...
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
Eliminate duplicated code in export method
2011-01-26 21:15:37 -08:00
James Dong
20586a128c
Eliminate duplicated code in export method
...
bug - 3385135
Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
2011-01-26 20:15:49 -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
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