OSDN Git Service
Romain Guy [Thu, 26 Aug 2010 00:28:50 +0000 (17:28 -0700)]
am
0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
Merge commit '
0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp
* commit '
0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
reserve android.opengl.GLWallpaperService name for future use
Romain Guy [Thu, 26 Aug 2010 00:26:20 +0000 (17:26 -0700)]
Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
Kenny Root [Thu, 26 Aug 2010 00:22:01 +0000 (17:22 -0700)]
am
2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
Merge commit '
2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp
* commit '
2e7427f39ec15dcb43cc1247372b53980be11d38':
Add LFH offset to verbose list of APK
Kenny Root [Thu, 26 Aug 2010 00:20:29 +0000 (17:20 -0700)]
Merge "Add LFH offset to verbose list of APK" into gingerbread
Dianne Hackborn [Wed, 25 Aug 2010 23:33:57 +0000 (16:33 -0700)]
am
50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Merge commit '
50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp
* commit '
50395e80718e77d27ec5e2d474b255e05de68d82':
Fix a fun bug with multiple service bindings from an activity.
Dianne Hackborn [Wed, 25 Aug 2010 23:31:34 +0000 (16:31 -0700)]
Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 23:07:25 +0000 (16:07 -0700)]
am
94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread
Merge commit '
94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp
* commit '
94e939e8794727f4f74839de23c5ac5f0d9f84b3':
Improve Sensors documentation a bit
Mathias Agopian [Wed, 25 Aug 2010 23:03:58 +0000 (16:03 -0700)]
Merge "Improve Sensors documentation a bit" into gingerbread
Andreas Huber [Wed, 25 Aug 2010 22:43:20 +0000 (15:43 -0700)]
am
8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
Merge commit '
8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp
* commit '
8ac0983edafa064126c4480dd31047d1bb4ce111':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
Mathias Agopian [Wed, 25 Aug 2010 22:40:44 +0000 (15:40 -0700)]
am
4cffbb47: Merge "fix [
2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
Merge commit '
4cffbb47a28faa594c2217d1e84f9382e0b57cc4' into gingerbread-plus-aosp
* commit '
4cffbb47a28faa594c2217d1e84f9382e0b57cc4':
fix [
2946787] Screen flicker on low resolution setting in camcorder.
Andreas Huber [Wed, 25 Aug 2010 22:35:53 +0000 (15:35 -0700)]
Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 22:25:32 +0000 (15:25 -0700)]
Merge "fix [
2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
Brad Fitzpatrick [Wed, 25 Aug 2010 22:19:57 +0000 (15:19 -0700)]
am
d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
Merge commit '
d0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp
* commit '
d0e6598b4a32f3000247341414449a3aa4d9f7f4':
Start of SharedPreferences$Editor.startCommit()
Brad Fitzpatrick [Wed, 25 Aug 2010 22:15:30 +0000 (15:15 -0700)]
Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread
Eric Laurent [Wed, 25 Aug 2010 22:11:30 +0000 (15:11 -0700)]
am
c14f9ca6: Merge "Added preset reverb." into gingerbread
Merge commit '
c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp
* commit '
c14f9ca6e5e795b641e7809786b4e51e13493907':
Added preset reverb.
Mathias Agopian [Wed, 25 Aug 2010 21:59:15 +0000 (14:59 -0700)]
fix [
2946787] Screen flicker on low resolution setting in camcorder.
Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
Eric Laurent [Wed, 25 Aug 2010 22:09:10 +0000 (15:09 -0700)]
Merge "Added preset reverb." into gingerbread
Andreas Huber [Wed, 25 Aug 2010 22:01:45 +0000 (15:01 -0700)]
am
23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
Merge commit '
235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp
* commit '
235840228b0692b66d854ff499b5c4060f883e03':
Ensure that buffering updates eventually hit 100% after we download everything.
Andreas Huber [Wed, 25 Aug 2010 21:54:36 +0000 (14:54 -0700)]
Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
Cary Clark [Wed, 25 Aug 2010 20:53:05 +0000 (13:53 -0700)]
am
d64f4a98: DO NOT MERGE fix null check
Merge commit '
d64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp
* commit '
d64f4a983df4fd11795e04896d8c48852f6b1777':
DO NOT MERGE fix null check
Andreas Huber [Wed, 25 Aug 2010 20:13:57 +0000 (13:13 -0700)]
am
b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
Merge commit '
b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp
* commit '
b8814dce287552c1bdf13fa999296ebc7387776d':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Andreas Huber [Wed, 25 Aug 2010 20:10:04 +0000 (13:10 -0700)]
Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
Mathias Agopian [Wed, 25 Aug 2010 19:17:19 +0000 (12:17 -0700)]
am
8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '
8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp
* commit '
8eb16af29303cda190133a1d220b9ecd9341e261':
don't try to lock a buffer that wasn't allocated with SW usage bits
Mathias Agopian [Wed, 25 Aug 2010 19:15:38 +0000 (12:15 -0700)]
Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread
Mathias Agopian [Fri, 20 Aug 2010 22:59:53 +0000 (15:59 -0700)]
don't try to lock a buffer that wasn't allocated with SW usage bits
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
Brian Carlstrom [Wed, 25 Aug 2010 18:04:26 +0000 (11:04 -0700)]
am
4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '
4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp
* commit '
4d672988fed7fbdd887fe78603fa2eaf713031ad':
Remove "StringTest.java".
Brian Carlstrom [Wed, 25 Aug 2010 18:02:22 +0000 (11:02 -0700)]
Merge "Remove "StringTest.java"." into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 17:55:47 +0000 (10:55 -0700)]
am
24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Merge commit '
24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp
* commit '
24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
Update AndroidRuntime with dalvik-dev changes
Brian Carlstrom [Wed, 25 Aug 2010 17:53:10 +0000 (10:53 -0700)]
Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
Eric Laurent [Wed, 25 Aug 2010 17:39:21 +0000 (10:39 -0700)]
am
67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '
67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp
* commit '
67b506065e9fe3c56e3d1b47eedfa01170d574f9':
Fix the simulator build.
Eric Laurent [Wed, 25 Aug 2010 17:37:27 +0000 (10:37 -0700)]
Merge "Fix the simulator build." into gingerbread
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:18:14 +0000 (10:18 -0700)]
am
7e2f87fa: am
d5e601c2: reconcile open-source froyo into google variant
Merge commit '
7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp
* commit '
7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
Make the default backup configuration "disabled; local transport selected"
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:15:38 +0000 (10:15 -0700)]
am
d5e601c2: reconcile open-source froyo into google variant
Merge commit '
d5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread
* commit '
d5e601c2304610085e3d7a276c4bbcd984ac89f9':
Make the default backup configuration "disabled; local transport selected"
Brian Carlstrom [Wed, 25 Aug 2010 17:07:18 +0000 (10:07 -0700)]
am
59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '
59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp
* commit '
59073b155ab0d8a5706c90200e6af614510aba0e':
Fix linux 64 build
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:38:48 +0000 (09:38 -0700)]
reconcile open-source froyo into google variant
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
Brian Carlstrom [Wed, 25 Aug 2010 16:28:00 +0000 (09:28 -0700)]
Merge "Fix linux 64 build" into gingerbread
Chih-Chung Chang [Wed, 25 Aug 2010 07:09:22 +0000 (00:09 -0700)]
am
231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '
231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp
* commit '
231a0005654d23284ab58a2d9ea892b995988c34':
Avoid allocating buffer every time getThumbnail is called.
Chih-Chung Chang [Wed, 25 Aug 2010 07:07:23 +0000 (00:07 -0700)]
Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Hung-ying Tyan [Wed, 25 Aug 2010 06:59:28 +0000 (23:59 -0700)]
am
37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '
37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp
* commit '
37f709aeb0424948a8f69577c6fad39dc95d7733':
SipProfile: add isOutgoingCallAllowed() and new builder constructor
Hung-ying Tyan [Wed, 25 Aug 2010 06:57:50 +0000 (23:57 -0700)]
Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Rohit Mungee [Wed, 25 Aug 2010 06:03:32 +0000 (23:03 -0700)]
am
bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Merge commit '
bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp
* commit '
bfc9325f8981173db51bc46af0e762dad1341671':
Add support for generated documentation as part of the SDK docs.
Rohit Mungee [Wed, 25 Aug 2010 05:59:41 +0000 (22:59 -0700)]
Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Daisuke Miyakawa [Wed, 25 Aug 2010 01:31:22 +0000 (18:31 -0700)]
am
d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit '
d0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp
* commit '
d0ad67ad84e254cdf34963ad4152ca7158df5eab':
Fix the test breakage in vCard tests.
Daisuke Miyakawa [Wed, 25 Aug 2010 01:29:24 +0000 (18:29 -0700)]
Merge "Fix the test breakage in vCard tests." into gingerbread
Christopher Tate [Wed, 25 Aug 2010 01:23:56 +0000 (18:23 -0700)]
am
2b81d6dd: am
02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '
2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp
* commit '
2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
Make the default backup configuration "disabled; local transport selected"
Christopher Tate [Wed, 25 Aug 2010 01:21:39 +0000 (18:21 -0700)]
am
02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '
02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread
* commit '
02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
Brad Fitzpatrick [Wed, 25 Aug 2010 01:14:10 +0000 (18:14 -0700)]
am
bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
Merge commit '
bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a' into gingerbread-plus-aosp
* commit '
bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a':
Negatively cache settings and proactively slurp settings into cache.
Brad Fitzpatrick [Wed, 25 Aug 2010 01:10:36 +0000 (18:10 -0700)]
Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
Christopher Tate [Wed, 25 Aug 2010 01:05:09 +0000 (18:05 -0700)]
Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Mathias Agopian [Tue, 24 Aug 2010 23:28:57 +0000 (16:28 -0700)]
am
8395b462: Merge "fix [
2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit '
8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp
* commit '
8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
fix [
2931513] Add support for setting the orientation of an ANativeWindow
Mathias Agopian [Tue, 24 Aug 2010 23:23:12 +0000 (16:23 -0700)]
Merge "fix [
2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Mathias Agopian [Fri, 20 Aug 2010 00:01:19 +0000 (17:01 -0700)]
fix [
2931513] Add support for setting the orientation of an ANativeWindow
Also implement support for cropping.
Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
Andreas Huber [Tue, 24 Aug 2010 22:06:31 +0000 (15:06 -0700)]
am
6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
Merge commit '
6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp
* commit '
6b6ae996b2e84af030397cff3a7f0087de93e01c':
A first shot at proper support for seeking of rtsp streams.
Andreas Huber [Tue, 24 Aug 2010 22:01:14 +0000 (15:01 -0700)]
Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
Dianne Hackborn [Tue, 24 Aug 2010 21:47:46 +0000 (14:47 -0700)]
am
4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
Merge commit '
4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp
* commit '
4af0cfad5305c8827c6235ca86e7db63b534ad68':
Verify that onPause() calls its superclass.
Dianne Hackborn [Tue, 24 Aug 2010 21:44:42 +0000 (14:44 -0700)]
Merge "Verify that onPause() calls its superclass." into gingerbread
Gilles Debunne [Tue, 24 Aug 2010 21:25:57 +0000 (14:25 -0700)]
am
e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit '
e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp
* commit '
e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
Fix for an NPE in TextView.
Gilles Debunne [Tue, 24 Aug 2010 21:23:37 +0000 (14:23 -0700)]
Merge "Fix for an NPE in TextView." into gingerbread
Brad Fitzpatrick [Tue, 24 Aug 2010 21:18:26 +0000 (14:18 -0700)]
am
b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit '
b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp
* commit '
b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
Some StrictMode API changes.
Brad Fitzpatrick [Tue, 24 Aug 2010 21:15:30 +0000 (14:15 -0700)]
Merge "Some StrictMode API changes." into gingerbread
Daisuke Miyakawa [Tue, 24 Aug 2010 20:39:42 +0000 (13:39 -0700)]
am
88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '
88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp
* commit '
88bff62c35e570a0c86eb55ded79d4600730226b':
Fix vCard so that it looks at IM correctly.
Daisuke Miyakawa [Tue, 24 Aug 2010 20:39:37 +0000 (13:39 -0700)]
am
6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
Merge commit '
6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp
* commit '
6dd19ca5cb78008d6793d0a223a6189786c5c62f':
Make VCardTestsBase public.
Daisuke Miyakawa [Tue, 24 Aug 2010 20:37:02 +0000 (13:37 -0700)]
Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Daisuke Miyakawa [Tue, 24 Aug 2010 20:36:43 +0000 (13:36 -0700)]
Merge "Make VCardTestsBase public." into gingerbread
Robert Greenwalt [Tue, 24 Aug 2010 19:04:52 +0000 (12:04 -0700)]
am
6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit '
6d7346933580c107f461885dc273d7298a46b0df' into gingerbread-plus-aosp
* commit '
6d7346933580c107f461885dc273d7298a46b0df':
Send all Connectivity broadcasts.
Robert Greenwalt [Tue, 24 Aug 2010 19:01:50 +0000 (12:01 -0700)]
Merge "Send all Connectivity broadcasts." into gingerbread
Gilles Debunne [Tue, 24 Aug 2010 17:30:09 +0000 (10:30 -0700)]
am
2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '
2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp
* commit '
2703a42d16af0e62da1bba02b6c935d98debf936':
When an EditText gains focus by tapping, move the insertion point where tapped.
Eric Laurent [Tue, 24 Aug 2010 16:58:23 +0000 (09:58 -0700)]
am
b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
Merge commit '
b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp
* commit '
b6d71351c074d5c0bc13a91544d776f1524eaabd':
LVM release 1.05 delivery
Eric Laurent [Tue, 24 Aug 2010 16:50:12 +0000 (09:50 -0700)]
Merge "LVM release 1.05 delivery" into gingerbread
Hung-ying Tyan [Tue, 24 Aug 2010 12:00:11 +0000 (05:00 -0700)]
am
3294d44b: Add confcall management to SIP calls
Merge commit '
3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp
* commit '
3294d44b96f63f647fba3a03604eb028e28a42bc':
Add confcall management to SIP calls
Chia-chi Yeh [Tue, 24 Aug 2010 09:30:14 +0000 (02:30 -0700)]
am
a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit '
a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8' into gingerbread-plus-aosp
* commit '
a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8':
RTP: integrate the echo canceller from speex.
Chia-chi Yeh [Tue, 24 Aug 2010 09:28:41 +0000 (02:28 -0700)]
Merge "RTP: integrate the echo canceller from speex." into gingerbread
Chia-chi Yeh [Tue, 24 Aug 2010 06:37:49 +0000 (23:37 -0700)]
am
5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '
5b1f0c9f6416719ef6194dd0c4e0f626ec84082c' into gingerbread-plus-aosp
* commit '
5b1f0c9f6416719ef6194dd0c4e0f626ec84082c':
RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
Brad Fitzpatrick [Tue, 24 Aug 2010 06:37:17 +0000 (23:37 -0700)]
am
d132892a: Merge "Don\'t touch the VFS during window relayout." into gingerbread
Merge commit '
d132892a75532557bb18af14eab6081704b7fa6d' into gingerbread-plus-aosp
* commit '
d132892a75532557bb18af14eab6081704b7fa6d':
Don't touch the VFS during window relayout.
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:37:06 +0000 (23:37 -0700)]
am
97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
97b5b7650236dd102fa48b51d9361289724a50e9' into gingerbread-plus-aosp
* commit '
97b5b7650236dd102fa48b51d9361289724a50e9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Amend previous ndc commit
Add a method to let a properly permissioned app directly
Changed SyncOperation.toKey() to not rely on the implementation of
Squashed commit of the following:
Add more error checking for ndc
PackageManagerService: always install native binaries from .apk
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Fix a bug where we cleaned an apps external data when upgrading it. :(
Skip hostname verification when using insecure factory
Flush binder buffer after setting raw heap to avoid leaking a reference.
Fix issue #
2834005: Android Settings.Secure bypass
Fix issue
2811538: System server crash when disconnecting BT headset after using SCO off call.
Verify hostname where possible, and clarify where not.
Chia-chi Yeh [Tue, 24 Aug 2010 06:28:45 +0000 (23:28 -0700)]
Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Brad Fitzpatrick [Tue, 24 Aug 2010 02:38:16 +0000 (19:38 -0700)]
Merge "Don't touch the VFS during window relayout." into gingerbread
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:08:27 +0000 (19:08 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
Dianne Hackborn [Tue, 24 Aug 2010 02:01:03 +0000 (19:01 -0700)]
am
f467ca08: Merge "More watermark work." into gingerbread
Merge commit '
f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp
* commit '
f467ca08dda9efece674efb0cc70c45fab4973a6':
More watermark work.
Dianne Hackborn [Tue, 24 Aug 2010 01:57:37 +0000 (18:57 -0700)]
Merge "More watermark work." into gingerbread
Dirk Dougherty [Tue, 24 Aug 2010 00:52:41 +0000 (17:52 -0700)]
am
afdc85f6: am
397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '
afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp
* commit '
afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Dirk Dougherty [Tue, 24 Aug 2010 00:49:49 +0000 (17:49 -0700)]
am
397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '
397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread
* commit '
397c0f5a18281e3880b9359feab683a13d271a03':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Dirk Dougherty [Tue, 24 Aug 2010 00:40:46 +0000 (17:40 -0700)]
Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Gilles Debunne [Mon, 23 Aug 2010 22:26:51 +0000 (15:26 -0700)]
am
3e05a0be: Hysteresis effect in Text selection.
Merge commit '
3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp
* commit '
3e05a0beb2fad0b21558019d2adf6805da70e10e':
Hysteresis effect in Text selection.
Jean-Baptiste Queru [Mon, 23 Aug 2010 21:20:47 +0000 (14:20 -0700)]
resolved conflicts for merge of
1ffd753e to gingerbread-plus-aosp
Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
Jean-Baptiste Queru [Mon, 23 Aug 2010 21:14:45 +0000 (14:14 -0700)]
am
6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '
6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp
* commit '
6864b3e2f4e67be847b2ae054f2f9c388f115722':
Adds the ability to Android to initiate a 2 Digit Call.
Mathias Agopian [Mon, 23 Aug 2010 20:56:22 +0000 (13:56 -0700)]
am
0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '
0c76c7c5eedf90b5fa1a95b6a9944b4e58747007' into gingerbread-plus-aosp
* commit '
0c76c7c5eedf90b5fa1a95b6a9944b4e58747007':
add new sensor types for handling gyro data and device orientation
Mathias Agopian [Mon, 23 Aug 2010 20:54:17 +0000 (13:54 -0700)]
Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Jean-Baptiste Queru [Mon, 23 Aug 2010 20:24:19 +0000 (13:24 -0700)]
Merge "Crash when powering off."
Jean-Baptiste Queru [Mon, 23 Aug 2010 20:22:00 +0000 (13:22 -0700)]
Merge "Adds the ability to Android to initiate a 2 Digit Call."
Sean McNeil [Mon, 23 Aug 2010 20:07:59 +0000 (13:07 -0700)]
am
40a87586: Only monitor recognized uevent devices.
Merge commit '
40a87586761450f80ad44f948a35266e87f326de' into gingerbread-plus-aosp
* commit '
40a87586761450f80ad44f948a35266e87f326de':
Only monitor recognized uevent devices.
Sean McNeil [Wed, 23 Jun 2010 09:00:37 +0000 (16:00 +0700)]
Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.
Change-Id: I489cc453bdce7cb376102cba67a9ea470e13292d
Scott Main [Mon, 23 Aug 2010 19:44:18 +0000 (12:44 -0700)]
am
e7aa645a: am
5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '
e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp
* commit '
e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
docs: add dev guide for getting user location
Scott Main [Mon, 23 Aug 2010 19:41:45 +0000 (12:41 -0700)]
am
5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '
5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread
* commit '
5a98fef352ed835406fa74a5563eadd9708f7cf9':
docs: add dev guide for getting user location
Scott Main [Mon, 23 Aug 2010 19:32:51 +0000 (12:32 -0700)]
Merge "docs: add dev guide for getting user location" into froyo
Andreas Huber [Mon, 23 Aug 2010 19:28:26 +0000 (12:28 -0700)]
am
3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '
3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp
* commit '
3e22ef1e111966df6ad527632fdc35d105c73916':
Better handling of rtsp connection and disconnection.
Andreas Huber [Mon, 23 Aug 2010 19:26:31 +0000 (12:26 -0700)]
Merge "Better handling of rtsp connection and disconnection." into gingerbread
James Dong [Mon, 23 Aug 2010 17:50:29 +0000 (10:50 -0700)]
am
3f51fa78: Runtime dump support for MediaWriter
Merge commit '
3f51fa78ada0e064d23db5961337280c267cc2c0' into gingerbread-plus-aosp
* commit '
3f51fa78ada0e064d23db5961337280c267cc2c0':
Runtime dump support for MediaWriter
Chia-chi Yeh [Mon, 23 Aug 2010 01:38:29 +0000 (18:38 -0700)]
am
b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit '
b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp
* commit '
b80e610b070c2cec98a228a8aec450dc24a5f90a':
Visualizer: replace the FFT implementation with a faster one.
Chia-chi Yeh [Mon, 23 Aug 2010 01:31:15 +0000 (18:31 -0700)]
Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
OSDN Git Service
