OSDN Git Service
Dianne Hackborn [Wed, 29 Sep 2010 01:20:26 +0000 (18:20 -0700)]
am
3e94b94f: Merge "Remove old location classes." into gingerbread
Merge commit '
3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp
* commit '
3e94b94f56888acbd1f8deb23c05474baaf4fae3':
Remove old location classes.
Dianne Hackborn [Wed, 29 Sep 2010 01:16:58 +0000 (18:16 -0700)]
Merge "Remove old location classes." into gingerbread
Kenny Root [Wed, 29 Sep 2010 00:33:47 +0000 (17:33 -0700)]
am
05105f7a: Update OBB API to include callbacks
Merge commit '
05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp
* commit '
05105f7abe02b2dff91d6260b3628c8b97816bab':
Update OBB API to include callbacks
Joe Onorato [Wed, 29 Sep 2010 00:22:09 +0000 (17:22 -0700)]
am
ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Merge commit '
ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp
* commit '
ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
Check for the DEVICE_POWER permission in userActivity.
Joe Onorato [Wed, 29 Sep 2010 00:22:02 +0000 (17:22 -0700)]
am
f2f34505: Merge "Fix
3041579 overscroll effect in notification area looks strange" into gingerbread
Merge commit '
f2f34505a1267955b5533ee04f803b1bcd83140a' into gingerbread-plus-aosp
* commit '
f2f34505a1267955b5533ee04f803b1bcd83140a':
Fix
3041579 overscroll effect in notification area looks strange
Joe Onorato [Wed, 29 Sep 2010 00:19:37 +0000 (17:19 -0700)]
Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
Joe Onorato [Wed, 29 Sep 2010 00:18:59 +0000 (17:18 -0700)]
Merge "Fix
3041579 overscroll effect in notification area looks strange" into gingerbread
Dianne Hackborn [Wed, 29 Sep 2010 00:16:31 +0000 (17:16 -0700)]
am
4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread
Merge commit '
4f67e1ccf1ae1a855521a307a13a728b8069838f' into gingerbread-plus-aosp
* commit '
4f67e1ccf1ae1a855521a307a13a728b8069838f':
Add location shared library for location provider APIs.
Dianne Hackborn [Wed, 29 Sep 2010 00:12:44 +0000 (17:12 -0700)]
Merge "Add location shared library for location provider APIs." into gingerbread
Eric Laurent [Tue, 28 Sep 2010 23:42:14 +0000 (16:42 -0700)]
am
aeb2c62e: Merge "Fix several audio effects problems." into gingerbread
Merge commit '
aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp
* commit '
aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
Fix several audio effects problems.
Eric Laurent [Tue, 28 Sep 2010 23:38:22 +0000 (16:38 -0700)]
Merge "Fix several audio effects problems." into gingerbread
Ying Wang [Tue, 28 Sep 2010 22:09:49 +0000 (15:09 -0700)]
am
292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread
Merge commit '
292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp
* commit '
292c246b27319bc2195e2b3dbc3c3adea22db672':
Call functions to calculate deps and classes.jar
Ying Wang [Tue, 28 Sep 2010 22:06:10 +0000 (15:06 -0700)]
Merge "Call functions to calculate deps and classes.jar" into gingerbread
Chia-chi Yeh [Tue, 28 Sep 2010 21:51:47 +0000 (14:51 -0700)]
am
320cdcb1: Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
Merge commit '
320cdcb122505ba703326a102f9b13d2f2f8847a' into gingerbread-plus-aosp
* commit '
320cdcb122505ba703326a102f9b13d2f2f8847a':
RTP: Delay the initialization of AudioTrack and AudioRecord.
Chia-chi Yeh [Tue, 28 Sep 2010 21:41:18 +0000 (14:41 -0700)]
Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
Jeff Brown [Tue, 28 Sep 2010 20:30:15 +0000 (13:30 -0700)]
am
65a5ba45: Merge "Fix bug in split touches." into gingerbread
Merge commit '
65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp
* commit '
65a5ba45559e88a50c258d794a1728498c248376':
Fix bug in split touches.
Jeff Brown [Tue, 28 Sep 2010 20:27:37 +0000 (13:27 -0700)]
Merge "Fix bug in split touches." into gingerbread
Jeff Brown [Tue, 28 Sep 2010 20:24:41 +0000 (13:24 -0700)]
Fix bug in split touches.
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
Andreas Huber [Tue, 28 Sep 2010 20:26:26 +0000 (13:26 -0700)]
am
88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
Merge commit '
88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp
* commit '
88a995edcf3c371845cb32aed8bcddb7509bf875':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Andreas Huber [Tue, 28 Sep 2010 20:23:26 +0000 (13:23 -0700)]
Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
Hung-ying Tyan [Tue, 28 Sep 2010 20:02:55 +0000 (13:02 -0700)]
am
6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Merge commit '
6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp
* commit '
6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
SIP: Feedback any provisional responses in addition to RING
Hung-ying Tyan [Tue, 28 Sep 2010 20:00:38 +0000 (13:00 -0700)]
Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
Gilles Debunne [Tue, 28 Sep 2010 20:00:32 +0000 (13:00 -0700)]
am
d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread
Merge commit '
d9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp
* commit '
d9743af92ead39b9f648043d165c415dfe8f3668':
New assets. DO NOT MERGE>
Gilles Debunne [Tue, 28 Sep 2010 19:56:54 +0000 (12:56 -0700)]
Merge "New assets. DO NOT MERGE>" into gingerbread
jsh [Tue, 28 Sep 2010 19:46:57 +0000 (12:46 -0700)]
am
37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
Merge commit '
37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp
* commit '
37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
Add line break between PLMN and SPN in windowshade.
jsh [Tue, 28 Sep 2010 19:44:47 +0000 (12:44 -0700)]
Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
Steve Howard [Tue, 28 Sep 2010 19:41:42 +0000 (12:41 -0700)]
am
5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '
5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp
* commit '
5bdb89d7ac20d4d3e71660d7fe78002a63900399':
Move DownloadManager to android.app (DO NOT MERGE)
Steve Howard [Tue, 28 Sep 2010 19:38:15 +0000 (12:38 -0700)]
Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Andreas Huber [Tue, 28 Sep 2010 19:05:08 +0000 (12:05 -0700)]
am
be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Merge commit '
be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp
* commit '
be0450619528e65eebfa1d7eab78fde757d094cc':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Andreas Huber [Tue, 28 Sep 2010 19:02:35 +0000 (12:02 -0700)]
Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Andreas Huber [Tue, 28 Sep 2010 18:48:44 +0000 (11:48 -0700)]
am
4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Merge commit '
4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp
* commit '
4769f57948455277d0670ef18f64824ca5d894c1':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Andreas Huber [Tue, 28 Sep 2010 18:46:41 +0000 (11:46 -0700)]
Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Andreas Huber [Tue, 28 Sep 2010 18:35:22 +0000 (11:35 -0700)]
am
3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '
3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp
* commit '
3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
Squashed commit of the following:
Dianne Hackborn [Tue, 28 Sep 2010 18:32:38 +0000 (11:32 -0700)]
am
08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Merge commit '
08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp
* commit '
08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
Fixes to granting URI permissions - take into account path perms.
Andreas Huber [Tue, 28 Sep 2010 18:27:33 +0000 (11:27 -0700)]
Merge "Squashed commit of the following:" into gingerbread
Dianne Hackborn [Tue, 28 Sep 2010 18:21:27 +0000 (11:21 -0700)]
Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
Irfan Sheriff [Tue, 28 Sep 2010 17:26:29 +0000 (10:26 -0700)]
am
c89dd54c: Remove logging on wifilock acquire/release
Merge commit '
c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp
* commit '
c89dd54ceeec99173d51d1196e2c03a58f120211':
Remove logging on wifilock acquire/release
Andy Stadler [Tue, 28 Sep 2010 17:06:27 +0000 (10:06 -0700)]
am
a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread
Merge commit '
a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp
* commit '
a16682b5e8ed635910eada23272ba6548922c02e':
Allow touch events when clickable *or* longClickable
Andy Stadler [Tue, 28 Sep 2010 16:26:49 +0000 (09:26 -0700)]
Merge "Allow touch events when clickable *or* longClickable" into gingerbread
Dave Sparks [Tue, 28 Sep 2010 15:52:23 +0000 (08:52 -0700)]
am
269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug
2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on t
Merge commit '
269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp
* commit '
269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
Fix media.player dumpsys to output open/mapped files correctly. Bug
2866669.
Dave Sparks [Tue, 28 Sep 2010 15:44:39 +0000 (08:44 -0700)]
Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug
2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread
Hung-ying Tyan [Tue, 28 Sep 2010 06:58:08 +0000 (23:58 -0700)]
am
624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit '
624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp
* commit '
624d5b4e8c20516516d0bff74479b9f5abdfe61c':
SIP: add DisconnectCause.SERVER_ERROR
Chung-yih Wang [Tue, 28 Sep 2010 05:58:59 +0000 (22:58 -0700)]
am
24547592: Fix the startAudio order for 3-way calls.
Merge commit '
245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp
* commit '
245475925eff61ee76bde58de69253a889e39d0a':
Fix the startAudio order for 3-way calls.
Hung-ying Tyan [Tue, 28 Sep 2010 04:09:56 +0000 (21:09 -0700)]
Jeff Brown [Tue, 28 Sep 2010 04:00:44 +0000 (21:00 -0700)]
am
9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Merge commit '
9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp
* commit '
9c37447e5c3555e4063777e4ef82e355e57f4c68':
Fix pointer index when splitting secondary pointers.
Jeff Brown [Tue, 28 Sep 2010 03:57:02 +0000 (20:57 -0700)]
Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 23:35:11 +0000 (16:35 -0700)]
Fix pointer index when splitting secondary pointers.
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
Hung-ying Tyan [Tue, 28 Sep 2010 02:26:11 +0000 (19:26 -0700)]
am
32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '
3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp
* commit '
3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
Hung-ying Tyan [Tue, 28 Sep 2010 02:23:35 +0000 (19:23 -0700)]
Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread
repo sync . build/envsetup.sh lunch passion-en [Tue, 28 Sep 2010 00:51:45 +0000 (17:51 -0700)]
Hung-ying Tyan [Mon, 27 Sep 2010 23:29:33 +0000 (16:29 -0700)]
am
68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Hung-ying Tyan [Mon, 27 Sep 2010 23:25:49 +0000 (16:25 -0700)]
Merge "Move SipService out of SystemServer to phone process." into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 23:17:28 +0000 (16:17 -0700)]
am
8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '
8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '
8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Gilles Debunne [Mon, 27 Sep 2010 23:07:47 +0000 (16:07 -0700)]
Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Nick Kralevich [Mon, 27 Sep 2010 22:26:51 +0000 (15:26 -0700)]
am
23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '
23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '
23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
Nick Kralevich [Mon, 27 Sep 2010 22:23:45 +0000 (15:23 -0700)]
Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Winson Chung [Mon, 27 Sep 2010 22:08:57 +0000 (15:08 -0700)]
am
44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp
* commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Eric Fischer [Mon, 27 Sep 2010 22:04:35 +0000 (15:04 -0700)]
am
dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp
* commit '
dc36da514832484f61b432291c6f5dca9f2c30bd':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 22:01:33 +0000 (15:01 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 21:32:06 +0000 (14:32 -0700)]
am
0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp
* commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91':
Revert previous status bar assets. DO NOT MERGE.
Gilles Debunne [Mon, 27 Sep 2010 21:26:56 +0000 (14:26 -0700)]
Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Chris Palmer [Mon, 27 Sep 2010 21:18:15 +0000 (14:18 -0700)]
am
143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
Wu-cheng Li [Mon, 27 Sep 2010 21:12:49 +0000 (14:12 -0700)]
am
83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '
83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp
* commit '
83ea6389097570e8526a0b612051bb591186f165':
The old overlay should be destroyed if orientation changes.
Wu-cheng Li [Mon, 27 Sep 2010 21:09:02 +0000 (14:09 -0700)]
Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Kenny Root [Mon, 27 Sep 2010 19:48:05 +0000 (12:48 -0700)]
am
04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp
* commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27':
Use buffered I/O during certificate parsing
Kenny Root [Mon, 27 Sep 2010 19:45:44 +0000 (12:45 -0700)]
Merge "Use buffered I/O during certificate parsing" into gingerbread
Dianne Hackborn [Mon, 27 Sep 2010 19:45:31 +0000 (12:45 -0700)]
am
d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit '
d8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp
* commit '
d8691d73d158acd9ffc63748126e822afd656707':
Allow all apps to call ContentResolver.getType().
Dianne Hackborn [Mon, 27 Sep 2010 19:42:34 +0000 (12:42 -0700)]
Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 19:37:03 +0000 (12:37 -0700)]
am
14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '
14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp
* commit '
14a288da6a372230d9af41da12241fe500eec837':
Add suuport for splitting touch events across windows.
Jeff Brown [Mon, 27 Sep 2010 19:33:14 +0000 (12:33 -0700)]
Merge "Add suuport for splitting touch events across windows." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:56:29 +0000 (11:56 -0700)]
am
524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp
* commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29':
We only need at most one tty icon.
Joe Onorato [Mon, 27 Sep 2010 18:56:24 +0000 (11:56 -0700)]
am
6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
Hung-ying Tyan [Mon, 27 Sep 2010 18:52:35 +0000 (11:52 -0700)]
Joe Onorato [Mon, 27 Sep 2010 18:41:24 +0000 (11:41 -0700)]
Merge "We only need at most one tty icon." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:40:15 +0000 (11:40 -0700)]
Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:35 +0000 (11:20 -0700)]
am
fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp
* commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8':
SipAudioCall: remove SipManager dependency.
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:30 +0000 (11:20 -0700)]
am
025a39af: SIP: misc fixes
Merge commit '
025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp
* commit '
025a39af346f39743c1e384b9000ce1baee36562':
SIP: misc fixes
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:24 +0000 (11:20 -0700)]
am
00a22064: SipService: handle cross-domain authentication error
Merge commit '
00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp
* commit '
00a22064efef4f574e439079aae2deae1a087a31':
SipService: handle cross-domain authentication error
Hung-ying Tyan [Mon, 27 Sep 2010 17:54:27 +0000 (10:54 -0700)]
Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Dan Morrill [Mon, 27 Sep 2010 17:39:19 +0000 (10:39 -0700)]
am
4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp
* commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b':
Adding a feature to indicate that the device possesses low-latency audio.
Dan Morrill [Mon, 27 Sep 2010 17:30:41 +0000 (10:30 -0700)]
Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread
James Dong [Mon, 27 Sep 2010 17:13:04 +0000 (10:13 -0700)]
am
bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Merge commit '
bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp
* commit '
bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
James Dong [Mon, 27 Sep 2010 17:08:52 +0000 (10:08 -0700)]
Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Andreas Huber [Mon, 27 Sep 2010 16:24:18 +0000 (09:24 -0700)]
am
abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit '
abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp
* commit '
abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
Support other kinds of HTTP redirect in NuHTTPDataSource
Andreas Huber [Mon, 27 Sep 2010 16:20:58 +0000 (09:20 -0700)]
Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Chung-yih Wang [Mon, 27 Sep 2010 16:03:01 +0000 (09:03 -0700)]
am
bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit '
bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp
* commit '
bd2294204e3edaede3fe81eb9b11c05c4fafe627':
Fix the unhold issue especially if one is behind NAT.
Eric Laurent [Mon, 27 Sep 2010 15:45:07 +0000 (08:45 -0700)]
am
9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '
9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp
* commit '
9627847d588cd969f60dcc79d165209184a90069':
Fix error in AudioEffect command status reporting.
Eric Laurent [Mon, 27 Sep 2010 15:41:00 +0000 (08:41 -0700)]
Merge "Fix error in AudioEffect command status reporting." into gingerbread
Kenny Root [Mon, 27 Sep 2010 15:15:57 +0000 (08:15 -0700)]
am
465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '
465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp
* commit '
465618ed567c418442890fcf91b6ee361b22b88b':
Use buffered output during packages.xml write
Kenny Root [Mon, 27 Sep 2010 15:03:47 +0000 (08:03 -0700)]
Merge "Use buffered output during packages.xml write" into gingerbread
Fabrice Di Meglio [Mon, 27 Sep 2010 09:27:08 +0000 (02:27 -0700)]
am
28fa220c: Merge "Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '
28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp
* commit '
28fa220c8da1ea2933ac96595516d1efa545c1ea':
Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
Fabrice Di Meglio [Mon, 27 Sep 2010 09:16:01 +0000 (02:16 -0700)]
Merge "Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Jeff Brown [Mon, 27 Sep 2010 05:20:12 +0000 (22:20 -0700)]
Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time. Could be used for
other things later.
Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.
Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
Mindy Pereira [Mon, 27 Sep 2010 01:37:04 +0000 (18:37 -0700)]
am
08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '
08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp
* commit '
08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
Mindy Pereira [Mon, 27 Sep 2010 01:16:26 +0000 (18:16 -0700)]
Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:41:59 +0000 (17:41 -0700)]
am
9035e206: reconcile froyo-release into gingerbread
Merge commit '
9035e206b3700928bc268b7c1ece34506e0a4f28' into gingerbread-plus-aosp
* commit '
9035e206b3700928bc268b7c1ece34506e0a4f28':
Add an option to hide the Voice Search icon.
Add BT test instrumentation for reboot tests.
DO NOT MERGE Separate utility methods into utility class.
Improve logging and flexibility of BT stress tests.
Remove @LargeTest annotations
Checkin initial bluetooth stress tests.
Change CDMAPhone.getDeviceId to return MEID or ESN.
Make the default backup configuration "disabled; local transport selected"
make android_id random seed depend on time as well as ro.serialno
Continue trying to make the turn off quickly after call feature work.
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:29:28 +0000 (17:29 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
John Wang [Sun, 26 Sep 2010 20:58:02 +0000 (13:58 -0700)]
am
8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '
8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp
* commit '
8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
Add debug functions.
John Wang [Sun, 26 Sep 2010 20:53:33 +0000 (13:53 -0700)]
Merge "Add debug functions." into gingerbread
Daisuke Miyakawa [Sun, 26 Sep 2010 20:12:55 +0000 (13:12 -0700)]
am
e0998604: Add necessary logic removed during backport
Merge commit '
e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp
* commit '
e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
Add necessary logic removed during backport
OSDN Git Service
