Commit Graph

13728 Commits

Author SHA1 Message Date
Eric Laurent
aaad676137 am c6aaa09b: am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
Merge commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b'

* commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:30:29 -08:00
Bjorn Bringert
7ebdc03a95 am e3dc9f49: am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4'

* commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4':
  Fix code example in Parcelable javadoc
2009-11-09 16:30:18 -08:00
Eric Laurent
9731f7c96f am 43396952: am 05388e45: am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '43396952a5b9466f18aa640f9755b6b80fa587f5'

* commit '43396952a5b9466f18aa640f9755b6b80fa587f5':
  More log for issue 2242381.
2009-11-09 16:30:05 -08:00
Dianne Hackborn
fc19a92334 am 794bfed0: am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '794bfed0b9d8fded77cf096213cfb36cf43189ba'

* commit '794bfed0b9d8fded77cf096213cfb36cf43189ba':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:29:48 -08:00
Mike Lockwood
57e05dfffa am 6a3f9e24: am 6bfd8d2a: am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '6a3f9e24b61e4da16bec7846b504c851ac7ac289'

* commit '6a3f9e24b61e4da16bec7846b504c851ac7ac289':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:29:36 -08:00
Mike Lockwood
9f244ce752 am e59631b6: am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0'

* commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:29:23 -08:00
Christopher Tate
670fb3732f am 2c203adb: am ee9f9759: am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit '2c203adbe6df2c0d86abf280cdc36917595fe41d'

* commit '2c203adbe6df2c0d86abf280cdc36917595fe41d':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:29:08 -08:00
Eric Laurent
c6aaa09b70 am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
Merge commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db' into eclair-mr2-plus-aosp

* commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:24:55 -08:00
Bjorn Bringert
e3dc9f491a am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp

* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
  Fix code example in Parcelable javadoc
2009-11-09 16:24:46 -08:00
Eric Laurent
43396952a5 am 05388e45: am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19' into eclair-mr2-plus-aosp

* commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19':
  More log for issue 2242381.
2009-11-09 16:24:37 -08:00
Dianne Hackborn
794bfed0b9 am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0' into eclair-mr2-plus-aosp

* commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:24:26 -08:00
Mike Lockwood
6a3f9e24b6 am 6bfd8d2a: am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92' into eclair-mr2-plus-aosp

* commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:24:15 -08:00
Mike Lockwood
e59631b601 am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp

* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:24:04 -08:00
Christopher Tate
2c203adbe6 am ee9f9759: am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit 'ee9f9759ba84b2a4a69d180e299511a91621f33a' into eclair-mr2-plus-aosp

* commit 'ee9f9759ba84b2a4a69d180e299511a91621f33a':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:23:53 -08:00
Eric Laurent
756e75cfcf am 090c60bb: Merge change I73b60354 into eclair
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2

* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:15:15 -08:00
Bjorn Bringert
e8341ebbc6 am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc
2009-11-09 16:15:05 -08:00
Eric Laurent
05388e454b am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-mr2

* commit '93572eef41f94f023037482f194db0ab07d0c33a':
  More log for issue 2242381.
2009-11-09 16:14:55 -08:00
Dianne Hackborn
2934bc1c43 am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-mr2

* commit '644693f4caf2364a0e811dca13304788e2c8fee8':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:14:38 -08:00
Mike Lockwood
6bfd8d2a31 am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-mr2

* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:14:26 -08:00
Jack Palevich
2806a6b5ff am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2
Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad'

* commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad':
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09 16:14:25 -08:00
Mike Lockwood
149f6710f7 am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-mr2

* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:14:14 -08:00
Christopher Tate
ee9f9759ba am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit '1dacdd482894bee9fbc1993cbb525fb800750222' into eclair-mr2

* commit '1dacdd482894bee9fbc1993cbb525fb800750222':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:14:02 -08:00
Jack Palevich
73ae27f0c5 am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2
Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp

* commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003':
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09 16:11:11 -08:00
Jack Palevich
8da3ac92a6 resolved conflicts for merge of 3f857b78 to eclair-mr2 2009-11-10 08:04:53 +08:00
Cynthia Wong
7e6422c1cc am 6720bb83: am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'

* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
  new gservices flag for delaying bad gmail operations
2009-11-09 14:14:55 -08:00
Derek Sollenberger
6f240aec18 am 29c00b0f: am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'

* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
  Allow plugins to load java classes from their apk.
2009-11-09 13:51:18 -08:00
Mike Lockwood
6b2f50de31 am 65fac51f: am 9882f385: am 96fce6e1: Merge change I62704736 into eclair
Merge commit '65fac51faf8ffe759a634497b1654a3b47406107'

* commit '65fac51faf8ffe759a634497b1654a3b47406107':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 13:51:07 -08:00
Cynthia Wong
6720bb8314 am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp

* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
  new gservices flag for delaying bad gmail operations
2009-11-09 13:26:00 -08:00
Android (Google) Code Review
26c91fa694 Merge change I4ff96000 into eclair-mr2
* changes:
  new gservices flag for delaying bad gmail operations
2009-11-09 13:23:23 -08:00
Derek Sollenberger
29c00b0f09 am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp

* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
  Allow plugins to load java classes from their apk.
2009-11-09 12:45:29 -08:00
Android (Google) Code Review
521123e0ed Merge change I9e28c4ce into eclair-mr2
* changes:
  Allow plugins to load java classes from their apk.
2009-11-09 12:42:35 -08:00
Mike Lockwood
65fac51faf am 9882f385: am 96fce6e1: Merge change I62704736 into eclair
Merge commit '9882f38584882461dbfef229e4fe316dacebd9c5' into eclair-mr2-plus-aosp

* commit '9882f38584882461dbfef229e4fe316dacebd9c5':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 12:15:04 -08:00
Grace Kloba
22e7d825b8 am 977e8d28: am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'

* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
  Add postdata identifier so that if we cache the post
2009-11-09 12:12:35 -08:00
Daisuke Miyakawa
6ddfe00729 am c53cc103: am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'

* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:12:24 -08:00
Daisuke Miyakawa
27700b7c19 am 75face7d: am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'

* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:12:13 -08:00
Jeff Sharkey
1cbbec066d am 4024c46f: am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '4024c46f91564ac49e022c5fcef85b8c6dba150b'

* commit '4024c46f91564ac49e022c5fcef85b8c6dba150b':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:11:54 -08:00
Jean-Baptiste Queru
3c08b74155 am ac94fbd0: merge from open-source master
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'

* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
  Capture failure of copybit->stretch()
  Fix obvious typo bug in egl.cpp
  LocationManagerService: Fix race when removing LocationListener
  Don't return when blocking is true.
  Fix of compatibility with multifunction extUSB adapters.
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-09 12:08:48 -08:00
Mike Lockwood
9882f38584 am 96fce6e1: Merge change I62704736 into eclair
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2

* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 12:07:05 -08:00
Grace Kloba
977e8d28e5 am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp

* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
  Add postdata identifier so that if we cache the post
2009-11-09 12:04:15 -08:00
Daisuke Miyakawa
c53cc10390 am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp

* commit '0e983864fca215513de9664573dcc3bbadf41e79':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:04:03 -08:00
Daisuke Miyakawa
75face7d2d am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp

* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:03:53 -08:00
Jeff Sharkey
4024c46f91 am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '06dc03f2cf98862717ba1aa0e858897363abc369' into eclair-mr2-plus-aosp

* commit '06dc03f2cf98862717ba1aa0e858897363abc369':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:03:40 -08:00
Derek Sollenberger
9e28c4ce66 Allow plugins to load java classes from their apk.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.

see http://b/2215696
2009-11-09 14:45:58 -05:00
Jean-Baptiste Queru
ac94fbd081 merge from open-source master 2009-11-09 11:00:18 -08:00
Android (Google) Code Review
e81c9609cc Merge change I8c92c39b into eclair-mr2
* changes:
  Add postdata identifier so that if we cache the post result, we will use (url+postIdentifier) as the key for the CacheResult.
2009-11-09 10:01:04 -08:00
Cynthia Wong
4ff960006f new gservices flag for delaying bad gmail operations 2009-11-09 09:42:14 -08:00
Android (Google) Code Review
090c60bb9d Merge change I73b60354 into eclair
* changes:
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 08:53:11 -08:00
Android (Google) Code Review
2bb5375433 Merge change Icaf932d0 into eclair
* changes:
  Fix code example in Parcelable javadoc
2009-11-09 08:09:35 -08:00
Eric Laurent
73b603546d AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
This problem was encountered as a side effect of issue 2245298.
2009-11-09 04:45:39 -08:00
Android (Google) Code Review
93572eef41 Merge change Ifb9d6df3 into eclair
* changes:
  More log for issue 2242381.
2009-11-08 22:58:34 -08:00