OSDN Git Service
Chris Palmer [Sun, 26 Sep 2010 21:17:32 +0000 (14:17 -0700)]
Merge "Clarify the explanation of Android's security design."
John Wang [Sun, 26 Sep 2010 21:16:29 +0000 (14:16 -0700)]
am
becc9148: am
8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '
becc9148e3698eeaf6ea854dabf2808490cd8f62'
* commit '
becc9148e3698eeaf6ea854dabf2808490cd8f62':
Add debug functions.
Daisuke Miyakawa [Sun, 26 Sep 2010 21:15:40 +0000 (14:15 -0700)]
am
b643cbe5: (-s ours) am
e0998604: Add necessary logic removed during backport
Merge commit '
b643cbe55852b01f1ab81da76d841b58d890276a'
* commit '
b643cbe55852b01f1ab81da76d841b58d890276a':
Add necessary logic removed during backport
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
Amith Yamasani [Sun, 26 Sep 2010 20:51:59 +0000 (13:51 -0700)]
Merge "Make the headers pane disappear in no-headers mode, not just the ListView."
Chet Haase [Sun, 26 Sep 2010 20:51:30 +0000 (13:51 -0700)]
Merge "bug fixes in animation classes"
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
Joe Onorato [Sun, 26 Sep 2010 20:05:15 +0000 (13:05 -0700)]
Merge "Notification updates."
Mike Lockwood [Sun, 26 Sep 2010 16:42:06 +0000 (09:42 -0700)]
Merge changes I1302cacd,I05125c79,I8d9653ce
* changes:
MTP: Fix some warnings
MTP: Include current property value in GetDevicePropDesc
MTP: Fix reading and writing device property descriptors
Sonia Serafimova [Sun, 26 Sep 2010 16:36:10 +0000 (09:36 -0700)]
am
f023c4dc: am
d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit '
f023c4dceb9cf112dd621b52b364211e2e549a06'
* commit '
f023c4dceb9cf112dd621b52b364211e2e549a06':
Prevent unhandled exception in NinePatchDrawable
Sonia Serafimova [Sun, 26 Sep 2010 16:33:31 +0000 (09:33 -0700)]
am
d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit '
d45a33554ca6c18ed81e45320998b9e4f4680379' into gingerbread-plus-aosp
* commit '
d45a33554ca6c18ed81e45320998b9e4f4680379':
Prevent unhandled exception in NinePatchDrawable
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:44:16 +0000 (08:44 -0700)]
am
ca3f968c: am
7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit '
ca3f968c6f0acbf94988d00bf21a82a2e8f49b86'
* commit '
ca3f968c6f0acbf94988d00bf21a82a2e8f49b86':
Prevent unhandled exception in NinePatchDrawable
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:44:07 +0000 (08:44 -0700)]
am
74a8df20: am
dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit '
74a8df2026514025b186aba80a810a03377a80e9'
* commit '
74a8df2026514025b186aba80a810a03377a80e9':
Fix if ACTION_DOWN and lost focus time too close, it will become long press.
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:39:03 +0000 (08:39 -0700)]
am
7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit '
7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp
* commit '
7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564':
Prevent unhandled exception in NinePatchDrawable
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:38:59 +0000 (08:38 -0700)]
am
dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit '
dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp
* commit '
dcfb271b7fa364d567ffd7c495b2baa28a755251':
Fix if ACTION_DOWN and lost focus time too close, it will become long press.
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:22:15 +0000 (08:22 -0700)]
Merge "Prevent unhandled exception in NinePatchDrawable"
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:16:26 +0000 (08:16 -0700)]
Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Romain Guy [Sat, 25 Sep 2010 01:45:13 +0000 (18:45 -0700)]
Merge "Add debug mode to measure performance."
Mathias Agopian [Sat, 25 Sep 2010 01:13:22 +0000 (18:13 -0700)]
am
495ad4f2: am
beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '
495ad4f22096aa172d025c16c25497e7dad8f2bd'
* commit '
495ad4f22096aa172d025c16c25497e7dad8f2bd':
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Dianne Hackborn [Sat, 25 Sep 2010 01:10:18 +0000 (18:10 -0700)]
am
c388844d: (-s ours) am
234e42df: DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Merge commit '
c388844d50a67ecd8eb93d29d618bae1fa3a3c5d'
* commit '
c388844d50a67ecd8eb93d29d618bae1fa3a3c5d':
DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Gil Dobjanschi [Sat, 25 Sep 2010 01:08:02 +0000 (18:08 -0700)]
Merge "Adjust the duration of transitions if needed."
Mathias Agopian [Sat, 25 Sep 2010 01:07:41 +0000 (18:07 -0700)]
am
beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '
beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp
* commit '
beabe75a842d521b005999460d3a6361ab32108e':
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Dianne Hackborn [Sat, 25 Sep 2010 01:05:14 +0000 (18:05 -0700)]
am
234e42df: DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Merge commit '
234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp
* commit '
234e42df5fac958ed9f15aae6005dd72e4bdf08a':
DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Mathias Agopian [Sat, 25 Sep 2010 01:02:10 +0000 (18:02 -0700)]
Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Patrick Dubroy [Sat, 25 Sep 2010 00:14:43 +0000 (17:14 -0700)]
am
a9cf4494: (-s ours) am
88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '
a9cf44942b8dbdc5bb00b80725ea15d176ebecc8'
* commit '
a9cf44942b8dbdc5bb00b80725ea15d176ebecc8':
do not merge - Asset update (pass #3)
Winson Chung [Sat, 25 Sep 2010 00:03:16 +0000 (17:03 -0700)]
Merge "Re-architecting RemoteViewsAdapter internals due to new constraints."
Raphael [Sat, 25 Sep 2010 00:02:00 +0000 (17:02 -0700)]
am
cb7c5498: am
91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
Merge commit '
cb7c5498709526e2a2367a7f36f83caf05be5f1a'
* commit '
cb7c5498709526e2a2367a7f36f83caf05be5f1a':
Layoutlib_create: Unittest for ClassHasNativeVisitor.
Patrick Dubroy [Sat, 25 Sep 2010 00:00:19 +0000 (17:00 -0700)]
am
88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '
88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp
* commit '
88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
do not merge - Asset update (pass #3)
Patrick Dubroy [Fri, 24 Sep 2010 23:57:46 +0000 (16:57 -0700)]
Merge "do not merge - Asset update (pass #3)" into gingerbread
Raphael [Fri, 24 Sep 2010 23:43:28 +0000 (16:43 -0700)]
am
91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
Merge commit '
91512f579e7a1bf91d23254471ee47d3a88d342f' into gingerbread-plus-aosp
* commit '
91512f579e7a1bf91d23254471ee47d3a88d342f':
Layoutlib_create: Unittest for ClassHasNativeVisitor.
Jeff Brown [Fri, 24 Sep 2010 23:14:08 +0000 (16:14 -0700)]
am
ca25d2c3: am
4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '
ca25d2c31dc20f69597be8f34d6da9167d53b4d0'
* commit '
ca25d2c31dc20f69597be8f34d6da9167d53b4d0':
Fixed some timeout and lock reentrance issues with broadcasts.
Jeff Brown [Fri, 24 Sep 2010 23:07:24 +0000 (16:07 -0700)]
am
4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '
4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp
* commit '
4d94a766c3f7cf32dd3f5d543048fa801ad22813':
Fixed some timeout and lock reentrance issues with broadcasts.
Steve Howard [Fri, 24 Sep 2010 23:02:45 +0000 (16:02 -0700)]
am
ffe47726: am
e78fc18b: Intent action to launch downloads UI.
Merge commit '
ffe477263c503ce75d609d5360cf5e0c72a1363f'
* commit '
ffe477263c503ce75d609d5360cf5e0c72a1363f':
Intent action to launch downloads UI.
Dianne Hackborn [Fri, 24 Sep 2010 22:58:25 +0000 (15:58 -0700)]
am
deaa8ff1: am
a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit '
deaa8ff1b10d38add4f7c276e7be2ffc19359a14'
* commit '
deaa8ff1b10d38add4f7c276e7be2ffc19359a14':
Some debugging support.
Hung-ying Tyan [Fri, 24 Sep 2010 22:58:09 +0000 (15:58 -0700)]
am
d6d83279: am
194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '
d6d83279183db749de07bfdac79fe4180fc848d0'
* commit '
d6d83279183db749de07bfdac79fe4180fc848d0':
SIP: longer timeout for making call, shorter for cancelling
Eric Laurent [Fri, 24 Sep 2010 22:57:44 +0000 (15:57 -0700)]
am
f3ae63ee: am
52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '
f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'
* commit '
f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
fix problem in AudioEffect JNI setup.
Nick Kralevich [Fri, 24 Sep 2010 22:57:16 +0000 (15:57 -0700)]
am
6c48f228: am
0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread
Merge commit '
6c48f228f10c63f83c25fc0c86a5a739266c61a9'
* commit '
6c48f228f10c63f83c25fc0c86a5a739266c61a9':
Use the default SecureRandom provider.
Steve Howard [Fri, 24 Sep 2010 22:51:50 +0000 (15:51 -0700)]
am
e78fc18b: Intent action to launch downloads UI.
Merge commit '
e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp
* commit '
e78fc18b339bfe2915e61aef2013a17f0a9ede33':
Intent action to launch downloads UI.
Dianne Hackborn [Fri, 24 Sep 2010 22:32:51 +0000 (15:32 -0700)]
am
a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit '
a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp
* commit '
a7ef18fca50d0db99a161d8c7e2d8979f0445503':
Some debugging support.
Dianne Hackborn [Fri, 24 Sep 2010 22:28:34 +0000 (15:28 -0700)]
Merge "Some debugging support." into gingerbread
Patrick Scott [Fri, 24 Sep 2010 22:22:49 +0000 (15:22 -0700)]
am
888bcdbe: am
3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '
888bcdbeca34819c07d7dc06dc03d91207aea0c0'
* commit '
888bcdbeca34819c07d7dc06dc03d91207aea0c0':
Add new Alarm provider class for setting an alarm.
Kenny Root [Fri, 24 Sep 2010 22:22:44 +0000 (15:22 -0700)]
am
c55f6da7: am
0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Merge commit '
c55f6da7281d34a4b875975cdf68f5062dfe4b34'
* commit '
c55f6da7281d34a4b875975cdf68f5062dfe4b34':
Revert "Revert "Free created FileMap when uncompressing files""
Kenny Root [Fri, 24 Sep 2010 22:22:38 +0000 (15:22 -0700)]
am
3e07c000: am
74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '
3e07c0007b10fbda945516acaf6b2a8787a6ca06'
* commit '
3e07c0007b10fbda945516acaf6b2a8787a6ca06':
Add locking around ZIP seeking
Andreas Huber [Fri, 24 Sep 2010 22:20:35 +0000 (15:20 -0700)]
am
a1c7b096: am
6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '
a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34'
* commit '
a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Hung-ying Tyan [Fri, 24 Sep 2010 22:19:05 +0000 (15:19 -0700)]
am
194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '
194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp
* commit '
194bbcce9ba15634500f542b9ea017b2cf154b45':
SIP: longer timeout for making call, shorter for cancelling
Mathias Agopian [Fri, 24 Sep 2010 22:01:49 +0000 (15:01 -0700)]
simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
Mathias Agopian [Fri, 24 Sep 2010 18:26:58 +0000 (11:26 -0700)]
add support for [
1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured
Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
Robert Greenwalt [Fri, 24 Sep 2010 21:48:25 +0000 (14:48 -0700)]
Merge "resolved conflicts for merge of
2d457a32 to master"
Robert Greenwalt [Fri, 24 Sep 2010 21:32:21 +0000 (14:32 -0700)]
resolved conflicts for merge of
2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
Eric Laurent [Fri, 24 Sep 2010 20:46:36 +0000 (13:46 -0700)]
am
52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '
52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp
* commit '
52f58e96a723a56e6619c237c814a07503745de9':
fix problem in AudioEffect JNI setup.
Eric Laurent [Fri, 24 Sep 2010 20:43:54 +0000 (13:43 -0700)]
Merge "fix problem in AudioEffect JNI setup." into gingerbread
Eric Fischer [Fri, 24 Sep 2010 20:18:57 +0000 (13:18 -0700)]
Merge "Import revised translations."
Nick Kralevich [Fri, 24 Sep 2010 20:16:19 +0000 (13:16 -0700)]
am
0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread
Merge commit '
0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp
* commit '
0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
Use the default SecureRandom provider.
Dianne Hackborn [Fri, 24 Sep 2010 18:16:23 +0000 (11:16 -0700)]
Some debugging support.
- New feature to "am monitor" to have it automatically launch
gdbserv for you when a crash/ANR happens, and tell you how to
run the client.
- Update dumpstate to match new location of binder debug logs
- Various commented out logs that are being used to track down
issues.
Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
Nick Kralevich [Fri, 24 Sep 2010 20:10:42 +0000 (13:10 -0700)]
Merge "Use the default SecureRandom provider." into gingerbread
Stephen Hines [Fri, 24 Sep 2010 19:10:31 +0000 (12:10 -0700)]
Merge "Adding support for dynamically updated test status"
Patrick Scott [Fri, 24 Sep 2010 18:36:51 +0000 (11:36 -0700)]
am
3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '
3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp
* commit '
3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
Add new Alarm provider class for setting an alarm.
Kenny Root [Fri, 24 Sep 2010 18:36:46 +0000 (11:36 -0700)]
am
0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Merge commit '
0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp
* commit '
0b60626391ec840cc4a6d58ef77a2d029c2209dd':
Revert "Revert "Free created FileMap when uncompressing files""
Kenny Root [Fri, 24 Sep 2010 18:36:42 +0000 (11:36 -0700)]
am
74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '
74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp
* commit '
74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
Add locking around ZIP seeking
Patrick Scott [Fri, 24 Sep 2010 18:34:10 +0000 (11:34 -0700)]
Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Kenny Root [Fri, 24 Sep 2010 18:33:35 +0000 (11:33 -0700)]
Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Kenny Root [Fri, 24 Sep 2010 18:33:29 +0000 (11:33 -0700)]
Merge "Add locking around ZIP seeking" into gingerbread
Eric Fischer [Fri, 24 Sep 2010 18:25:47 +0000 (11:25 -0700)]
am
f2af2d92: (-s ours) am
4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'
* commit '
f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
Import revised translations. DO NOT MERGE
Andreas Huber [Fri, 24 Sep 2010 18:09:33 +0000 (11:09 -0700)]
am
6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '
6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp
* commit '
6d8fae722cfb2833dd542b2a5e613582a9096fc6':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Robert Greenwalt [Fri, 24 Sep 2010 18:09:29 +0000 (11:09 -0700)]
am
8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '
8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp
* commit '
8f97fe551e7bd95abf395eed303b975eaa8f0158':
Move long Connectivity tasks to handler thread.
Eric Fischer [Fri, 24 Sep 2010 18:05:07 +0000 (11:05 -0700)]
am
4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp
* commit '
4318ab058629b701e225bb7ead9dd2b229c9354b':
Import revised translations. DO NOT MERGE
James Dong [Fri, 24 Sep 2010 17:56:19 +0000 (10:56 -0700)]
Merge "Added two more video encoders"
Mike Lockwood [Fri, 24 Sep 2010 17:45:38 +0000 (10:45 -0700)]
Merge "Add constant for SDCARD_RW group ID."
Andreas Huber [Fri, 24 Sep 2010 17:44:01 +0000 (10:44 -0700)]
Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Robert Greenwalt [Fri, 24 Sep 2010 17:42:46 +0000 (10:42 -0700)]
Merge "Move long Connectivity tasks to handler thread." into gingerbread
Eric Fischer [Fri, 24 Sep 2010 17:37:04 +0000 (10:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Fri, 24 Sep 2010 17:34:28 +0000 (10:34 -0700)]
Marco Nelissen [Fri, 24 Sep 2010 17:27:36 +0000 (10:27 -0700)]
Merge "Send album artist to the media provider again."
Eric Laurent [Fri, 24 Sep 2010 16:49:07 +0000 (09:49 -0700)]
am
880dfe4f: Merge "Fix issue
3007862" into gingerbread
Merge commit '
880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp
* commit '
880dfe4f675128188f8d598f2025a417ccabd1bf':
Fix issue
3007862
Eric Laurent [Fri, 24 Sep 2010 16:43:24 +0000 (09:43 -0700)]
Merge "Fix issue
3007862" into gingerbread
Alex Sakhartchouk [Fri, 24 Sep 2010 16:42:47 +0000 (09:42 -0700)]
Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages"
Kenny Root [Fri, 24 Sep 2010 16:11:28 +0000 (09:11 -0700)]
Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit
a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
Andreas Huber [Fri, 24 Sep 2010 15:38:04 +0000 (08:38 -0700)]
am
19fe783d: am
37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '
19fe783d83b10ecfae3494f7b1ceff9584ad3839'
* commit '
19fe783d83b10ecfae3494f7b1ceff9584ad3839':
Proper sync-frame detection for sources that don't already provide it.
Andreas Huber [Fri, 24 Sep 2010 15:27:33 +0000 (08:27 -0700)]
am
37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '
37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp
* commit '
37155854b4d9ca405e5c41c4ab271006a4716193':
Proper sync-frame detection for sources that don't already provide it.
Andreas Huber [Fri, 24 Sep 2010 15:17:20 +0000 (08:17 -0700)]
Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread
Kenny Root [Fri, 24 Sep 2010 14:57:37 +0000 (07:57 -0700)]
Add locking around ZIP seeking
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.
Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
Steve Block [Fri, 24 Sep 2010 10:32:14 +0000 (03:32 -0700)]
Merge "Remove superfluous Ahem.tff"
satok [Fri, 24 Sep 2010 08:41:50 +0000 (01:41 -0700)]
am
abdbb5c1: am
933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit '
abdbb5c1e5144e11d72367f79816caaa1dc63f8d'
* commit '
abdbb5c1e5144e11d72367f79816caaa1dc63f8d':
Use MOTOYA font for Japanese font
satok [Fri, 24 Sep 2010 08:37:39 +0000 (01:37 -0700)]
am
933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit '
933fc94ce1ca4a1ead83dbc2a0f50f7324b28982' into gingerbread-plus-aosp
* commit '
933fc94ce1ca4a1ead83dbc2a0f50f7324b28982':
Use MOTOYA font for Japanese font
satok [Fri, 24 Sep 2010 08:33:23 +0000 (01:33 -0700)]
Merge "Use MOTOYA font for Japanese font" into gingerbread
Hung-ying Tyan [Fri, 24 Sep 2010 06:24:35 +0000 (23:24 -0700)]
Merge "fix build"
Chia-chi Yeh [Fri, 24 Sep 2010 05:50:10 +0000 (22:50 -0700)]
Hung-ying Tyan [Fri, 24 Sep 2010 05:45:43 +0000 (13:45 +0800)]
resolved conflicts for merge of
ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
Mathias Agopian [Fri, 24 Sep 2010 04:41:30 +0000 (21:41 -0700)]
am
4eb1ad5e: am
524a6d8e: Merge "better fix for [
3028370] GL get error should return a valid error if no context is bound." into gingerbread
Merge commit '
4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'
* commit '
4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
better fix for [
3028370] GL get error should return a valid error if no context is bound.
Steve Howard [Fri, 24 Sep 2010 04:40:48 +0000 (21:40 -0700)]
am
56d60903: am
a7bfe6ad: Support "seascape" rotation for "landscape-only" apps
Merge commit '
56d6090380027efc7910537a2c2b99097ca36778'
* commit '
56d6090380027efc7910537a2c2b99097ca36778':
Support "seascape" rotation for "landscape-only" apps
Joe Onorato [Fri, 24 Sep 2010 04:40:24 +0000 (21:40 -0700)]
am
982c07e9: am
cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit '
982c07e908c4cb66db224ccfd0810bf8bd449835'
* commit '
982c07e908c4cb66db224ccfd0810bf8bd449835':
Crash apps when they provide bad notifications instead of crashing the system process.
Chung-yih Wang [Fri, 24 Sep 2010 04:39:49 +0000 (21:39 -0700)]
am
1e2df14a: am
f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit '
1e2df14a85f098d63b618531db733a21429d4037'
* commit '
1e2df14a85f098d63b618531db733a21429d4037':
Handle OPTIONS requests from SIP servers.
Dianne Hackborn [Fri, 24 Sep 2010 04:28:38 +0000 (21:28 -0700)]
Merge "resolved conflicts for merge of
8952a448 to master"
Dianne Hackborn [Fri, 24 Sep 2010 02:08:08 +0000 (19:08 -0700)]
resolved conflicts for merge of
8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
Mike Lockwood [Fri, 24 Sep 2010 03:09:46 +0000 (20:09 -0700)]
Merge changes Ie8bd9107,I1065179a
* changes:
MTP: Reenable GetObjectPropValue and SetObjectPropValue
MTP: Minor debug output cleanup
Chia-chi Yeh [Fri, 24 Sep 2010 02:22:12 +0000 (19:22 -0700)]
am
658bec95: SDP: remove dead code.
Merge commit '
658bec956785e074edc4f6c9fe739c366e37be33' into gingerbread-plus-aosp
* commit '
658bec956785e074edc4f6c9fe739c366e37be33':
SDP: remove dead code.
Mike Lockwood [Fri, 24 Sep 2010 02:11:21 +0000 (19:11 -0700)]
Merge changes I75c4c7dc,Ie9f3dea3
* changes:
MTP: List all the formats we support in addition to FORMAT_UNDEFINED
MTP: Fix problems with signed ints in MtpCursor.cpp
Hung-ying Tyan [Fri, 24 Sep 2010 02:10:49 +0000 (19:10 -0700)]
am
84a357bb: Refactoring SIP classes to get ready for API review.
Merge commit '
84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp
* commit '
84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
Refactoring SIP classes to get ready for API review.
Mathias Agopian [Fri, 24 Sep 2010 01:19:46 +0000 (18:19 -0700)]
Merge "dump HWC state in dumpsys"