Commit Graph

20944 Commits

Author SHA1 Message Date
Rich Cannings
ec36038605 am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread
Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'

* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
  Remove the use of FileInputStream.available()
2010-09-09 16:51:53 -07:00
Andreas Huber
ffb374dc84 am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread
Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
2010-09-09 16:48:58 -07:00
Rich Cannings
a48f498d18 am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp

* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
  Remove the use of FileInputStream.available()
2010-09-09 16:45:34 -07:00
Andreas Huber
a4ca36f9d5 am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
2010-09-09 16:42:17 -07:00
Rich Cannings
a13697f701 Merge "Remove the use of FileInputStream.available()" into gingerbread 2010-09-09 16:41:29 -07:00
Andreas Huber
8c423e61be Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 2010-09-09 16:39:09 -07:00
Wu-cheng Li
8adcfa4929 Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary." 2010-09-09 16:31:13 -07:00
Jaikumar Ganesh
a67ba6ec84 am 41506304: (-s ours) am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '41506304b86a9c9a605e8b96318e61f0f8f6a235'

* commit '41506304b86a9c9a605e8b96318e61f0f8f6a235':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
2010-09-09 16:10:12 -07:00
Mike Lockwood
9507eda268 am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'

* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
  Only pulse notification light if a new notification has been received since the screen was last turned off
2010-09-09 16:10:00 -07:00
Henrik Backlund
743c89a066 am f49b052d: am a79c8291: Fix to get A2DP to connect after unpairing
Merge commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e'

* commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e':
  Fix to get A2DP to connect after unpairing
2010-09-09 16:09:54 -07:00
Jaikumar Ganesh
e35258f379 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
2010-09-09 16:05:43 -07:00
Mike Lockwood
d4225c0e57 am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp

* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
  Only pulse notification light if a new notification has been received since the screen was last turned off
2010-09-09 16:05:38 -07:00
Gilles Debunne
93b06f4457 Merge "Revert "update-api step missing from 65349"" 2010-09-09 15:58:51 -07:00
Christopher Tate
93b739a48c Merge "Don't crash in batterystats" 2010-09-09 15:53:09 -07:00
Chet Haase
d2a7ec7933 Merge "Fix bug with pivot point not including translationXY factors" 2010-09-09 15:39:46 -07:00
Mike Lockwood
6739d7715c Merge "Use separate Uris for MTP to the media provider files table" 2010-09-09 15:37:31 -07:00
Henrik Backlund
acb85f02e5 am a79c8291: Fix to get A2DP to connect after unpairing
Merge commit 'a79c82918e3df38197cd4c81d10049401485036e' into gingerbread-plus-aosp

* commit 'a79c82918e3df38197cd4c81d10049401485036e':
  Fix to get A2DP to connect after unpairing
2010-09-09 15:20:28 -07:00
Jaikumar Ganesh
e3138edec6 Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 2010-09-09 15:18:36 -07:00
Jason Sams
9e14a3404b Merge "Rework gl perf test to focus on important use cases." 2010-09-09 14:51:56 -07:00
Romain Guy
ed771a1adb Merge "Add support for advanced blend modes with the framebuffer." 2010-09-09 14:44:17 -07:00
Robert Greenwalt
c9f16e79a9 Merge "Fix the build" 2010-09-09 14:26:38 -07:00
Gilles Debunne
cb0f1cbe62 am 2b88c5c7: am 47fa8e80: Fix for an IndentOutOfBounds in TextField.
Merge commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434'

* commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434':
  Fix for an IndentOutOfBounds in TextField.
2010-09-09 14:23:42 -07:00
Gilles Debunne
dad9dfab40 am ca1b2615: am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit 'ca1b26150943829a296bf38e55ff9c55dbd98182'

* commit 'ca1b26150943829a296bf38e55ff9c55dbd98182':
  Made context menu appear when tapping inside selection.
2010-09-09 14:23:20 -07:00
Mathias Agopian
0b30bf5782 am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into gingerbread
Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c'

* commit '45bd99466ce9962778eacaefff1c0a44bb268f0c':
  option to enable multisampling
2010-09-09 14:23:09 -07:00
Jean-Baptiste Queru
afdf77bb9c Merge " Initial contribution from Sony Corporation." 2010-09-09 14:22:50 -07:00
Steve Howard
1d1e88d566 am 1ed20dc4: am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit '1ed20dc43b070903597c55738f342bc77f7ab21d'

* commit '1ed20dc43b070903597c55738f342bc77f7ab21d':
  Hidden API to control sorting of download manager queries.
2010-09-09 14:22:12 -07:00
Mathias Agopian
acd8fd0493 am a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread
Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0'

* commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0':
  Fix a few typos in EGL wrapper
2010-09-09 14:21:55 -07:00
Jaikumar Ganesh
9a2e44e2e5 am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8'

* commit '049912b76f320c55cfe56394e520ee2c35f913b8':
  Fix to get A2DP to connect after unpairing
2010-09-09 14:21:32 -07:00
Andreas Huber
2f5e14eb0f am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'

* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
2010-09-09 14:21:19 -07:00
James Dong
4dbc903b30 am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412'

* commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412':
  When 32-bit offset is used,
2010-09-09 14:21:07 -07:00
Gilles Debunne
70fe545df3 Merge "resolved conflicts for merge of ff545380 to master" 2010-09-09 14:14:05 -07:00
Gilles Debunne
5f262a4e91 resolved conflicts for merge of ff545380 to master
Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
2010-09-09 14:07:56 -07:00
Mike Lockwood
738ba833cb Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 2010-09-09 14:02:19 -07:00
Andreas Huber
f99fa1679b am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
2010-09-09 13:48:53 -07:00
John Wang
c03a63f1af Merge "Fix SimUtilsTest after changing in bcdToString." 2010-09-09 13:39:43 -07:00
Robert Greenwalt
0e8525fb87 Merge "resolved conflicts for merge of ec52c98d to master" 2010-09-09 13:37:42 -07:00
Christopher Tate
e60e5c7a07 Merge "Mute some spammy log messages from KeyButtonView" 2010-09-09 13:36:04 -07:00
Robert Greenwalt
cd45cacffa resolved conflicts for merge of ec52c98d to master
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
2010-09-09 13:15:32 -07:00
Mike Lockwood
2250a579ec Merge "MTP: Fix support for transfering folders and playlists." 2010-09-09 13:03:11 -07:00
Erik Gilling
e9a02ec207 Merge "surfaceflinger: give hwcomposer a chance to release buffers" 2010-09-09 13:01:27 -07:00
Erik Gilling
3cab73e3a1 Merge "surfaceflinger: composite HWC_SKIP_LAYER layers" 2010-09-09 13:01:23 -07:00
Erik Gilling
0347ec7ecc Merge "surfaceflinger: unlock clients only after flip" 2010-09-09 13:01:18 -07:00
Adam Powell
62f5977c30 Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets" 2010-09-09 12:26:16 -07:00
Gilles Debunne
704d06ee0c am 47fa8e80: Fix for an IndentOutOfBounds in TextField.
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
2010-09-09 12:14:59 -07:00
Antti Hatala
f5f2712854 surfaceflinger: give hwcomposer a chance to release buffers
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
2010-09-09 12:06:48 -07:00
Antti Hatala
586a0deb76 surfaceflinger: composite HWC_SKIP_LAYER layers
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
2010-09-09 12:06:31 -07:00
Antti Hatala
8392b504bd surfaceflinger: unlock clients only after flip
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
2010-09-09 12:06:18 -07:00
Gilles Debunne
dc0174105d am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
2010-09-09 12:00:52 -07:00
Mathias Agopian
bae7b39496 am fec5d38b: Merge "option to enable multisampling" into gingerbread
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
2010-09-09 11:58:14 -07:00
Gilles Debunne
29d6cb8e31 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00