OSDN Git Service
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:44:27 +0000 (09:44 -0700)]
am
076d0654: Merge "SIM toolkit enhancements and bug fixes"
Merge commit '
076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp
* commit '
076d06547f90c480a4ed19da6f4b3d1270f57ec9':
SIM toolkit enhancements and bug fixes
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:29:03 +0000 (09:29 -0700)]
Merge "SIM toolkit enhancements and bug fixes"
Patrick Scott [Wed, 11 Aug 2010 14:18:27 +0000 (07:18 -0700)]
am
9902196f: Fix npe in getCacheTotalSize.
Merge commit '
9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp
* commit '
9902196f9885d369e37cf44084e3f04513511ab0':
Fix npe in getCacheTotalSize.
Patrick Scott [Wed, 11 Aug 2010 13:48:43 +0000 (09:48 -0400)]
Fix npe in getCacheTotalSize.
Bug:
2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
Hung-ying Tyan [Wed, 11 Aug 2010 08:56:56 +0000 (01:56 -0700)]
am
1777a274: SIP: remove unused file.
Merge commit '
1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp
* commit '
1777a2748bfa25dfd9d081d71504572b9a7256b1':
SIP: remove unused file.
Hung-ying Tyan [Wed, 11 Aug 2010 08:48:14 +0000 (16:48 +0800)]
SIP: remove unused file.
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
Dianne Hackborn [Wed, 11 Aug 2010 07:47:51 +0000 (00:47 -0700)]
am
a5ae50cd: Merge "More native work." into gingerbread
Merge commit '
a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp
* commit '
a5ae50cd838b5725c63ed485292aae4edd1a98cb':
More native work.
Dianne Hackborn [Wed, 11 Aug 2010 07:45:44 +0000 (00:45 -0700)]
Merge "More native work." into gingerbread
Dianne Hackborn [Wed, 4 Aug 2010 18:12:40 +0000 (11:12 -0700)]
More native work.
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
Chung-yih Wang [Wed, 11 Aug 2010 06:41:48 +0000 (23:41 -0700)]
am
2725a655: Fix a bug in unregisterPhone().
Merge commit '
2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp
* commit '
2725a6551261044318e42ccc9ebeabed7edf5ee7':
Fix a bug in unregisterPhone().
Chung-yih Wang [Wed, 11 Aug 2010 06:22:34 +0000 (14:22 +0800)]
Fix a bug in unregisterPhone().
Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
Hung-ying Tyan [Wed, 11 Aug 2010 03:50:40 +0000 (20:50 -0700)]
am
091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '
091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '
091c5238a00ca51dc69b8b09459e6ac88e1eb077':
SipAudioCall: perform local ops before network op in endCall()
Hung-ying Tyan [Wed, 11 Aug 2010 03:48:18 +0000 (20:48 -0700)]
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Chung-yih Wang [Wed, 11 Aug 2010 03:47:18 +0000 (20:47 -0700)]
am
f57324cf: Add getSipUri() for identification.
Merge commit '
f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp
* commit '
f57324cf4f82947296f4d1acb9df1f3c9c03134e':
Add getSipUri() for identification.
Chung-yih Wang [Wed, 11 Aug 2010 03:12:05 +0000 (11:12 +0800)]
Add getSipUri() for identification.
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
Yu Shan Emily Lau [Wed, 11 Aug 2010 03:09:24 +0000 (20:09 -0700)]
am
fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit '
fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp
* commit '
fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Yu Shan Emily Lau [Wed, 11 Aug 2010 03:06:39 +0000 (20:06 -0700)]
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Yu Shan Emily Lau [Wed, 11 Aug 2010 01:30:44 +0000 (18:30 -0700)]
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
Konstantin Lopyrev [Wed, 11 Aug 2010 02:02:51 +0000 (19:02 -0700)]
am
91a7f5fe: Making sure that the prefix is handled properly.
Merge commit '
91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp
* commit '
91a7f5fef8a9fc496acef23f513cb48139e8dff5':
Making sure that the prefix is handled properly.
Konstantin Lopyrev [Wed, 11 Aug 2010 01:54:54 +0000 (18:54 -0700)]
Making sure that the prefix is handled properly.
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
Adam Powell [Wed, 11 Aug 2010 00:54:58 +0000 (17:54 -0700)]
am
224ab9a5: Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Merge commit '
224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp
* commit '
224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Konstantin Lopyrev [Wed, 11 Aug 2010 00:52:32 +0000 (17:52 -0700)]
am
f39d5987: Merge "Categorizing exported view properties." into gingerbread
Merge commit '
f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp
* commit '
f39d5987b977fdff8c34a2ddabaec31d1e909db3':
Categorizing exported view properties.
Adam Powell [Wed, 11 Aug 2010 00:52:15 +0000 (17:52 -0700)]
Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Adam Powell [Wed, 11 Aug 2010 00:50:11 +0000 (17:50 -0700)]
Fix public bug code.google.com/p/android/issues/detail?id=10067
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
Konstantin Lopyrev [Wed, 11 Aug 2010 00:48:27 +0000 (17:48 -0700)]
Merge "Categorizing exported view properties." into gingerbread
Konstantin Lopyrev [Wed, 11 Aug 2010 00:02:18 +0000 (17:02 -0700)]
Categorizing exported view properties.
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
Jeff Brown [Tue, 10 Aug 2010 23:33:47 +0000 (16:33 -0700)]
am
c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
Merge commit '
c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp
* commit '
c3fc2d03d58a258c53c9265a70143d4af076b764':
Fix safe mode and KeyEvent.getMaxKeyCode().
Jeff Brown [Tue, 10 Aug 2010 23:31:04 +0000 (16:31 -0700)]
am
d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Merge commit '
d98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit '
d98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
Jeff Brown [Tue, 10 Aug 2010 22:47:53 +0000 (15:47 -0700)]
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug:
2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
Jeff Brown [Tue, 10 Aug 2010 23:26:56 +0000 (16:26 -0700)]
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Kenny Root [Tue, 10 Aug 2010 22:38:41 +0000 (15:38 -0700)]
am
6061af11: Merge "Sort the IME list before showing to user"
Merge commit '
6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '
6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
Kenny Root [Tue, 10 Aug 2010 22:22:13 +0000 (15:22 -0700)]
Merge "Sort the IME list before showing to user"
Andreas Huber [Tue, 10 Aug 2010 21:15:11 +0000 (14:15 -0700)]
am
1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit '
1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp
* commit '
1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
Remove some obsolete code.
Andreas Huber [Tue, 10 Aug 2010 21:09:39 +0000 (14:09 -0700)]
Merge "Remove some obsolete code." into gingerbread
Mathias Agopian [Tue, 10 Aug 2010 20:52:58 +0000 (13:52 -0700)]
am
603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
Merge commit '
603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '
603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
Mathias Agopian [Tue, 10 Aug 2010 20:50:22 +0000 (13:50 -0700)]
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
Andreas Huber [Tue, 10 Aug 2010 20:00:52 +0000 (13:00 -0700)]
Remove some obsolete code.
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
James Dong [Tue, 10 Aug 2010 20:28:56 +0000 (13:28 -0700)]
am
10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit '
10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp
* commit '
10ed3f7438f6ae797bac32476dc61465c6484c85':
Add input buffer size check for software video encoders
James Dong [Tue, 10 Aug 2010 20:27:09 +0000 (13:27 -0700)]
Merge "Add input buffer size check for software video encoders" into gingerbread
Andreas Huber [Tue, 10 Aug 2010 20:01:58 +0000 (13:01 -0700)]
am
18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Merge commit '
18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '
18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Andreas Huber [Tue, 10 Aug 2010 19:59:27 +0000 (12:59 -0700)]
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Eric Fischer [Tue, 10 Aug 2010 19:00:12 +0000 (12:00 -0700)]
am
605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp
* commit '
605f402796afa9c88e2f91284e98d1f59a0726aa':
Import revised translations. DO NOT MERGE
Eric Rowe [Tue, 10 Aug 2010 19:00:07 +0000 (12:00 -0700)]
am
edae848e: am
301c437b: Remove @LargeTest annotations
Merge commit '
edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp
* commit '
edae848eb62e27b8e987aa89557d1456304fada7':
Remove @LargeTest annotations
Eric Fischer [Tue, 10 Aug 2010 18:54:24 +0000 (11:54 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Rowe [Tue, 10 Aug 2010 18:53:59 +0000 (11:53 -0700)]
am
301c437b: Remove @LargeTest annotations
Merge commit '
301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '
301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
Eric Fischer [Tue, 10 Aug 2010 18:50:15 +0000 (11:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I24dd4ee2c61694e917db02c92396134df65c0218
Andreas Huber [Tue, 10 Aug 2010 18:45:01 +0000 (11:45 -0700)]
am
235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
Merge commit '
235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp
* commit '
235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Andreas Huber [Tue, 10 Aug 2010 18:39:38 +0000 (11:39 -0700)]
Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
Andreas Huber [Tue, 10 Aug 2010 18:18:36 +0000 (11:18 -0700)]
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
James Dong [Tue, 10 Aug 2010 00:45:29 +0000 (17:45 -0700)]
Add input buffer size check for software video encoders
Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
James Dong [Tue, 10 Aug 2010 17:44:25 +0000 (10:44 -0700)]
am
532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Merge commit '
532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp
* commit '
532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
James Dong [Tue, 10 Aug 2010 17:41:29 +0000 (10:41 -0700)]
Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Brett Chabot [Tue, 10 Aug 2010 17:30:32 +0000 (10:30 -0700)]
am
e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit '
e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp
* commit '
e967ee49b5a86de2be11dd1d28283c337b01e537':
Fix gingerbread FrameworkCoreTests makefile.
Brett Chabot [Tue, 10 Aug 2010 17:27:48 +0000 (10:27 -0700)]
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
James Dong [Sun, 8 Aug 2010 15:56:48 +0000 (08:56 -0700)]
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
o Assume there is only a single output buffer containing such information.
This simplifies the logic in MP4 file writer
o Output SPS and PPS in the very first buffer for software AVC encoder
This is to make AVC encoder work with the MP4 file writer
o Add timestamp value for codec config data
Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
Andreas Huber [Tue, 10 Aug 2010 17:10:40 +0000 (10:10 -0700)]
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
Hung-ying Tyan [Tue, 10 Aug 2010 05:37:46 +0000 (22:37 -0700)]
am
259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
Merge commit '
259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp
* commit '
259b4c860212dd528b25d1cce6e74be01afed85c':
SIP: clean up unused class and fields.
Hung-ying Tyan [Tue, 10 Aug 2010 05:30:58 +0000 (22:30 -0700)]
Merge "SIP: clean up unused class and fields." into gingerbread
Hung-ying Tyan [Tue, 10 Aug 2010 05:23:12 +0000 (13:23 +0800)]
SipAudioCall: perform local ops before network op in endCall()
Change-Id: I1808f715d56c0979cea7741cb5bdb3831774d3ef
Hung-ying Tyan [Tue, 10 Aug 2010 04:00:45 +0000 (12:00 +0800)]
SIP: clean up unused class and fields.
Change-Id: I79ed7fb324fea9a52946340055b5ea1d389a926a
Jaikumar Ganesh [Tue, 10 Aug 2010 02:53:57 +0000 (19:53 -0700)]
am
745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '
745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp
* commit '
745d1e905886ed0d8fa0a8590463093d125bc53a':
Update javadoc for the API and change return of getBondedDevices().
Konstantin Lopyrev [Tue, 10 Aug 2010 02:53:48 +0000 (19:53 -0700)]
am
6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '
6c6d57c6a04eed154de1f7d9b544c2cb34a83dac' into gingerbread-plus-aosp
* commit '
6c6d57c6a04eed154de1f7d9b544c2cb34a83dac':
Fix focus notification
Konstantin Lopyrev [Tue, 10 Aug 2010 02:53:44 +0000 (19:53 -0700)]
am
63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '
63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp
* commit '
63cca69157eae17da2a5492d1bcb7330061a52ac':
Make sure profiling is done only for views that are actually measured, laid out and drawn.
Jean-Michel Trivi [Tue, 10 Aug 2010 02:53:20 +0000 (19:53 -0700)]
am
66edf558: Merge "Fix bug
2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '
66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp
* commit '
66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
Fix bug
2684341 Don't steal the media button event from the phone
Jaikumar Ganesh [Tue, 10 Aug 2010 02:53:16 +0000 (19:53 -0700)]
am
cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit '
cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp
* commit '
cbaef51847ab8d8c4d039f0e425d434811f77f0d':
Check whether Bluetooth is enabled before making any API calls.
James Dong [Tue, 10 Aug 2010 02:53:12 +0000 (19:53 -0700)]
am
959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit '
959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp
* commit '
959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
Support multiple PPS and SPS in avcC box
Andreas Huber [Tue, 10 Aug 2010 02:53:01 +0000 (19:53 -0700)]
am
4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit '
4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp
* commit '
4edf85abc919b7d0e8db71c0c6166c7994269830':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Eric Laurent [Tue, 10 Aug 2010 02:52:53 +0000 (19:52 -0700)]
am
67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Merge commit '
67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp
* commit '
67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
Added tests for audio effects in MediaFrameworkTest
Eric Laurent [Tue, 10 Aug 2010 02:52:43 +0000 (19:52 -0700)]
am
2a6b80bc: Fixed several audio effects problems.
Merge commit '
2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp
* commit '
2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
Fixed several audio effects problems.
Hung-ying Tyan [Tue, 10 Aug 2010 02:52:28 +0000 (19:52 -0700)]
am
8fb2e6e4: PhoneFactory: add makeSipPhone()
Merge commit '
8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp
* commit '
8fb2e6e4720385961083a150a3e848ccaef544ae':
PhoneFactory: add makeSipPhone()
Hung-ying Tyan [Tue, 10 Aug 2010 02:52:19 +0000 (19:52 -0700)]
am
d122805b: CallManager: add getAllPhones().
Merge commit '
d122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp
* commit '
d122805bbfcb770f941cac259bcefafdb2d3ad56':
CallManager: add getAllPhones().
Jeff Brown [Tue, 10 Aug 2010 01:50:35 +0000 (18:50 -0700)]
Optimize VelocityTracker to run in linear time.
Uses a linked list for efficient pointer addition and removal.
When possible, makes use of the fact that pointer ids are usually in
sorted order to avoid quadratic time lookups when adding new data.
Fixed an incorrect assumption that the pointer count would always change
when old pointers were removed.
Also fixed a bug in InputQueue FinishedCallback recycling.
Change-Id: Ie048d3bb022d39cf4185e2fe43923a861d94c4f3
Brett Chabot [Tue, 10 Aug 2010 01:49:54 +0000 (18:49 -0700)]
Fix gingerbread FrameworkCoreTests makefile.
android-common should be included as a static library.
Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
Mathias Agopian [Tue, 10 Aug 2010 01:35:43 +0000 (18:35 -0700)]
improve a bit the implementation of eglGetProcAddress
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
Jaikumar Ganesh [Tue, 10 Aug 2010 00:30:25 +0000 (17:30 -0700)]
Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Konstantin Lopyrev [Tue, 10 Aug 2010 00:03:10 +0000 (17:03 -0700)]
Merge "Fix focus notification" into gingerbread
Konstantin Lopyrev [Tue, 10 Aug 2010 00:02:39 +0000 (17:02 -0700)]
Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Jaikumar Ganesh [Mon, 9 Aug 2010 23:54:03 +0000 (16:54 -0700)]
Update javadoc for the API and change return of getBondedDevices().
getBondedDevices() *might* work if called before the Bluetooth
State intent is broadcasted. However, this can cause ANRs and problems.
This API was updated to return null, if called before the intent
is received. However, this might cause existing apps to crash. Return
an empty set instead.
Change-Id: Ibc484d3394aa0bbebd651221efde6a7015ce7110
Konstantin Lopyrev [Tue, 10 Aug 2010 00:01:11 +0000 (17:01 -0700)]
Fix focus notification
Change-Id: I51d73100695ceb70620754a1897ace681a26d839
Eric Rowe [Mon, 9 Aug 2010 22:34:24 +0000 (15:34 -0700)]
Remove @LargeTest annotations
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
Jean-Michel Trivi [Mon, 9 Aug 2010 21:19:08 +0000 (14:19 -0700)]
Merge "Fix bug
2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Jaikumar Ganesh [Mon, 9 Aug 2010 20:50:28 +0000 (13:50 -0700)]
Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Jaikumar Ganesh [Sat, 7 Aug 2010 02:03:13 +0000 (19:03 -0700)]
Check whether Bluetooth is enabled before making any API calls.
For example, Settings app makes calls to get Bonded Devices
before Bluetooth is on. This leads to ANRs and will
prevent autoconnection.
Change-Id: I56748a9bd1d603b5782c17775c6b20b831bf6572
James Dong [Mon, 9 Aug 2010 20:35:54 +0000 (13:35 -0700)]
Merge "Support multiple PPS and SPS in avcC box" into gingerbread
James Dong [Fri, 6 Aug 2010 07:29:03 +0000 (00:29 -0700)]
Support multiple PPS and SPS in avcC box
- Also
o do not use the hard-coded profile and levels.
Instead, we are using the profile and level found in the codec config data
o we are not supporting FRExt profile and levels for now, which requires
additional seq parameter set extension for instance.
Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
Jean-Michel Trivi [Mon, 14 Jun 2010 16:53:30 +0000 (09:53 -0700)]
Fix bug
2684341 Don't steal the media button event from the phone
app is the phone is ringing, even in silent mode.
Use the PhoneStateListener to know whether the phone is ringing,
as the mode is not MODE_RINGTONE when ringing in silent mode.
Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
Andreas Huber [Mon, 9 Aug 2010 18:30:34 +0000 (11:30 -0700)]
Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Eric Laurent [Mon, 9 Aug 2010 17:42:27 +0000 (10:42 -0700)]
Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Andreas Huber [Mon, 9 Aug 2010 16:54:59 +0000 (09:54 -0700)]
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6
related-to-bug:
2900021
Eric Laurent [Fri, 30 Jul 2010 06:43:43 +0000 (23:43 -0700)]
Fixed several audio effects problems.
- Fixed constant inversions in AudioEffect.java
- Do not return error when enabling an already enabled effect
- Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method
- Remove click when restarting effect during disable sequence
- Fixed problem in master mute management when volume control is delegated to effect.
Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
Eric Laurent [Wed, 28 Jul 2010 08:20:13 +0000 (01:20 -0700)]
Added tests for audio effects in MediaFrameworkTest
This CL adds a set of automated functional tests for the AudioEffect class
and the following derived classes:
BassBoost, Equalizer, Virtualizer and Visualizer.
These tests require the following file on the SD card:
/sdcard/media_api/music/sine_200+1000Hz_44K_mo.wav
Change-Id: I6ec3ec6f9ede10ccf2dd3b1e9ee4b08396740dee
Hung-ying Tyan [Mon, 9 Aug 2010 09:15:35 +0000 (17:15 +0800)]
PhoneFactory: add makeSipPhone()
Change-Id: I8e7abb0623724d24c6f82829ff06663a31ba32fb
Hung-ying Tyan [Mon, 9 Aug 2010 08:14:15 +0000 (16:14 +0800)]
CallManager: add getAllPhones().
Change-Id: I50589aaec55925d93c392f15a22c70d2a6634b87
Dan Egnor [Sat, 7 Aug 2010 01:59:49 +0000 (18:59 -0700)]
am
799f2bb0: am
b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '
799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp
* commit '
799f2bb04102b4b692b52eed5c36aea9a8cde471':
COMMENT ONLY change to fix some formatting glitches and
Dan Egnor [Sat, 7 Aug 2010 01:55:05 +0000 (18:55 -0700)]
am
b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '
b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread
* commit '
b37bca9e79489a1abd848ce762bb7d87203b3414':
COMMENT ONLY change to fix some formatting glitches and
Andreas Huber [Sat, 7 Aug 2010 01:54:31 +0000 (18:54 -0700)]
am
ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit '
ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp
* commit '
ad98d383a04fce08a147b200e23b12f12b2681a3':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Andreas Huber [Sat, 7 Aug 2010 01:54:26 +0000 (18:54 -0700)]
am
261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '
261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp
* commit '
261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
Properly skip the 'skip' chunk in mpeg4 files.
Steve Howard [Sat, 7 Aug 2010 01:54:22 +0000 (18:54 -0700)]
am
9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '
9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp
* commit '
9fbf00cb041eeb22acad93deace9712c57b4c594':
Slight improvement (hopefully) to orientation sensing.
Konstantin Lopyrev [Sat, 7 Aug 2010 01:54:18 +0000 (18:54 -0700)]
am
3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '
3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp
* commit '
3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
Adding a way for Hierarchy Viewer to get the focused window.
Steve Howard [Sat, 7 Aug 2010 01:54:13 +0000 (18:54 -0700)]
am
db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit '
db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp
* commit '
db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
New drawables for the update to the maps API (DO NOT MERGE)