11137 Commits

Author SHA1 Message Date
Android (Google) Code Review
de342a01a0 Merge change Idcd98310 into eclair
* changes:
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:34:48 -08:00
Daisuke Miyakawa
5d30aa183f Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
e.g. "# Comment?"

In both vCard 2.1 and vCard 3.0, this syntax is never allowed, but some actual exporter seems to emit this kind of comment sometimes.

Both vCard 2.1 and vCard 3.0 allows some property to use multiple lines, so this change may cause another problem.
For example, if the "NOTE" property uses Quoted-Printable type, has several lines, and one of the lines starts with '#', we cannot know whether the line is "comment" or not.
Fortunately, in this change, the line is parsed as part of "NOTE" property, so I think there's no problem "right now", which does not mean that it is completely fine with vCard files Android will encounter in the future.

This change is already submitted into MR2.

Internal issue number: 2245363
2009-11-10 20:34:09 +09:00
Jack Palevich
67dcd6c239 Fix multi-lock ordering issues in GLSurfaceView
There were potential deadlocks between the per-GLThread monitors and the
GLThreadManager monitor.

To avoid these deadlocks we now use a single monitor for
both the GLThreadManager state and the per-GLThread state.

Converted GLThreadManager's semaphore into the equivalent
synchronized-wait-notifyAll code. This enables us to wait for
either mDone, or user events, or the EGL surface with a single "wait()".

Simplified the logic used to acquire and release the EGL surface. The
EGL surface is now only requested while the surfaceFlinger surface
is acquired.

Removed the "egl surface stealing" policy we had recently inserted.
It's not needed now that we reliably quit when requested.

Pulled user event processing outside of the  GLThreadManager monitor
so that we don't call any potentially-long-running code while
inside the monitor.

This should help with bug 2228262.
2009-11-10 18:26:42 +08:00
Mathias Agopian
d9bec297fd am c421fc2a: Merge change Id09376d1 into eclair
Merge commit 'c421fc2ada7c1bff104733b840bd640151bebbbb' into eclair-plus-aosp

* commit 'c421fc2ada7c1bff104733b840bd640151bebbbb':
  fix [2071412] work around mdp 32-bits fade limitation
2009-11-09 19:34:26 -08:00
Marco Nelissen
47fc5e2a43 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:14 -08:00
Android (Google) Code Review
c421fc2ada Merge change Id09376d1 into eclair
* changes:
  fix [2071412] work around mdp 32-bits fade limitation
2009-11-09 19:32:47 -08:00
Android (Google) Code Review
11cff8cd30 Merge change Ie211adae into eclair
* changes:
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:31:02 -08:00
Dave Sparks
65809a3d26 am 0c845661: Add new ringtone package. Bug 2219950.
Merge commit '0c845661c54bac56910706b1fc0d88288b954890' into eclair-plus-aosp

* commit '0c845661c54bac56910706b1fc0d88288b954890':
  Add new ringtone package. Bug 2219950.
2009-11-09 19:06:18 -08:00
Dave Sparks
8b5eafea0f am bb0db626: Merge change I2a4b120c into eclair
Merge commit 'bb0db6267851b923a8370355c68adfc3bb30108d' into eclair-plus-aosp

* commit 'bb0db6267851b923a8370355c68adfc3bb30108d':
  Add more ringtones. Bug 2219950.
2009-11-09 19:06:09 -08:00
Dave Sparks
0c845661c5 Add new ringtone package. Bug 2219950. 2009-11-09 19:02:33 -08:00
Android (Google) Code Review
bb0db62678 Merge change I2a4b120c into eclair
* changes:
  Add more ringtones. Bug 2219950.
2009-11-09 19:02:17 -08:00
Scott Main
9fab0aef19 docs: add more documentation for the bluetooth apis.
more descriptions for some of the classes and a new
overview and pseudo-code example for using BT APIs
in the package summary.
2009-11-09 18:09:12 -08:00
Mathias Agopian
d09376d1e2 fix [2071412] work around mdp 32-bits fade limitation
make sure to always specify blits *inside* the source bitmap.
2009-11-09 17:55:59 -08:00
Marco Nelissen
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -08:00
Jean-Baptiste Queru
df682c8443 Fix build 2009-11-09 17:33:17 -08:00
Dave Sparks
42acab9751 Add more ringtones. Bug 2219950. 2009-11-09 16:58:14 -08:00
Xavier Ducrohet
d9d0528f30 am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-plus-aosp

* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
  Support for fallback fonts in layoutlib.
2009-11-09 16:56:56 -08:00
Mike Lockwood
24ace3395b PowerManagerService: enable logging for when mPowerState changes.
Change-Id: Idcd983106d66629070eda15e1160f708c789ab05
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-09 19:54:02 -05:00
Android (Google) Code Review
e6ab011b8b Merge change Ib12bcb7f into eclair
* changes:
  Support for fallback fonts in layoutlib.
2009-11-09 16:52:54 -08:00
Alexey Tarasov
f2db9fb0f8 Typo fix in javadoc
@throw -> @throws
@Deprecated -> @deprecated
2009-11-09 16:07:14 -08:00
Gloria Wang
c060d86f7d Check whether test server is up before running tests which use streaming files. 2009-11-09 15:51:12 -08:00
Xavier Ducrohet
9a4593ffcc Support for fallback fonts in layoutlib.
BUG 2041229

Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
2009-11-09 14:55:08 -08:00
Dave Sparks
074bd7f14b am 3ea2ae7d: Merge change I47aa76bf into eclair
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-plus-aosp

* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
  Add new notifications and ringtones.
2009-11-09 13:49:16 -08:00
Android (Google) Code Review
3ea2ae7d6f Merge change I47aa76bf into eclair
* changes:
  Add new notifications and ringtones.
2009-11-09 13:46:17 -08:00
Robert Greenwalt
c84aa67608 am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-plus-aosp

* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
  Fix the selection of locale from SIM mcc.
2009-11-09 12:41:44 -08:00
Dave Sparks
253c595761 Add new notifications and ringtones. 2009-11-09 12:41:09 -08:00
Android (Google) Code Review
fe225e25bd Merge change I70e1f7a6 into eclair
* changes:
  Fix the selection of locale from SIM mcc.
2009-11-09 12:37:22 -08:00
Dianne Hackborn
0be1f78c97 Fix issue #2246723: Only one Application object gets onCreate called
Change-Id: I83ba96fe81ad04258099d6f94a667dc7d9dd4fd3
2009-11-09 12:30:12 -08:00
Eric Laurent
f75074393c am 090c60bb: Merge change I73b60354 into eclair
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-plus-aosp

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

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc
2009-11-09 11:55:37 -08:00
Eric Laurent
758b9e9a60 am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-plus-aosp

* commit '93572eef41f94f023037482f194db0ab07d0c33a':
  More log for issue 2242381.
2009-11-09 11:55:25 -08:00
Dianne Hackborn
0d05863c1e am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-plus-aosp

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

* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 11:55:00 -08:00
Mike Lockwood
3e06771680 am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp

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

* commit '1dacdd482894bee9fbc1993cbb525fb800750222':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 11:54:40 -08:00
Jack Palevich
55723d86bd am 3f857b78: Merge change I32d41651 into eclair
Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp

* commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc':
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09 11:54:29 -08:00
Mike Lockwood
34894fb43e am 96fce6e1: Merge change I62704736 into eclair
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp

* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 11:54:18 -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
Android (Google) Code Review
644693f4ca Merge change Ic42763b1 into eclair
* changes:
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-08 18:07:14 -08:00
Dianne Hackborn
badc47ecd1 Fix issue #2242440: Window screen brightness attribute is broken
Um okay, that was dumb.  And I guess this means it is time to make 6.xml.

Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1
2009-11-08 17:37:50 -08:00
Jean-Baptiste Queru
bcd20496e0 merge from open-source master 2009-11-08 17:03:30 -08:00
Mike Lockwood
ba8eb1efef Use SystemClock.elapsedRealtime() instead of sensor timestamp
when processing light and proximity events.
This should fix loss of 2 second hysterisis for light sensor (b/2243521)

Change-Id: Ia3ce331e67d803eb5e51810cb7161b7c528312d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-08 19:31:18 -05:00
Android (Google) Code Review
17479ebe90 Merge change I1bc566a1 into eclair
* changes:
  Ignore the light sensor if the screen is turning off.
2009-11-08 15:51:02 -08:00
Mike Lockwood
497087e33d Ignore the light sensor if the screen is turning off.
Fixes bug b/2202165.  The light sensor was interfering with the screen off animation.

Change-Id: I1bc566a164af689b60b066e6cb3dcbf7959bc50a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-08 18:43:12 -05:00
Christopher Tate
1dacdd4828 Reset binder service threads' cgroup/priority after command completion
To prevent buggy command implementations from poisoning binder threads'
scheduling class & priority for future command execution, we now reset the
cgroup and thread priority to foreground/normal when a binder service thread
finishes executing the designated command.

Change-Id: Ibc0ab2485751453f6dc96fdb4eb877fd02796e3f
2009-11-08 14:29:02 -08:00
Android Code Review
4d88cbd98e Merge change Ia01d5fe8
* changes:
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-08 12:33:19 -08:00
Android (Google) Code Review
3f857b78fc Merge change I32d41651 into eclair
* changes:
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-08 10:19:59 -08:00