10354 Commits

Author SHA1 Message Date
Android (Google) Code Review
250aa068ea Merge change Idf7fafd3 into eclair
* changes:
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 10:54:58 -08:00
Lixin Yue
cf25073348 am 971af003: Merge change I65208317 into eclair
Merge commit '971af0030568ba25a83788506a3f29bc9f1cd10d' into eclair-mr2

* commit '971af0030568ba25a83788506a3f29bc9f1cd10d':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 09:58:51 -08:00
Dianne Hackborn
acbd9fdaf0 am 48515f49: Merge change I0de7979b into eclair
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2

* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 09:58:38 -08:00
Android (Google) Code Review
b9c40a65c7 Merge change I5d30aa18 into eclair
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-10 23:03:57 -08:00
Daisuke Miyakawa
e464de6b76 Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
This change is based on the change I319bf9ee, but different in that there's no test, since
test framework for vCard code is just in MR2, not in MR1.

Internal issue number: 2246410

Dr.NO: Hiroshi
2009-11-11 15:42:55 +09:00
Android (Google) Code Review
dd86168992 Merge change I05fd0df0 into eclair
* changes:
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-10 22:29:59 -08:00
Android (Google) Code Review
fe17db4c02 Merge change I4db11d50 into eclair
* changes:
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-10 22:03:20 -08:00
Jack Wang
4f414bd7a7 Make perf metrics collection & output via instrumentation simpler
- Added includeDetailedStats metadata to TimedTest for collecting additional
  metrics like memory usage and binder transactions
- Added PerformanceCollectorTestCase interface for hard-typing test class as
  performance test while still able to inherit from instrumenation test classes
- Reverted previous changes to PerformanceTestBase, will deprecate
  PerformanceTestBase/Case in a future CL
- Removed 'performance.' prefix from keys written to instrumentation output
2009-11-10 19:26:14 -08:00
Android (Google) Code Review
83536cee2b Merge change I1179efbb into eclair-mr2
* changes:
  resolved conflicts for merge of ba56915a to eclair-mr2
2009-11-10 18:03:35 -08:00
Jack Palevich
1179efbb3b resolved conflicts for merge of ba56915a to eclair-mr2 2009-11-11 10:01:46 +08:00
Daisuke Miyakawa
3de8ed6c88 Backport the change I30b141a2 from MR2 to MR1. Do not merge.
The previous implementation selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object without valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.

Dr.NO: Hiroshi

Internal issue number: 2252304
2009-11-11 10:24:40 +09:00
Dave Sparks
05fd0df0f3 Fix potential deadlock in stopPreview/stopRecord.
Some camera HALs spin up a preview thread and need to wait for
the thread to exit. This can create a potential deadlock. In
stopPreview, we take the main lock. If a preview callback occurs
while the lock is held, the preview thread will block. If the
camera HAL is waiting for the preview thread to exit, this will
cause a deadlock.

This patch breaks out the preview buffer heap into a separate
mutex. This mutex is never held when the main lock is held, thus
preventing the deadlock from occuring.
2009-11-10 17:08:08 -08:00
Dianne Hackborn
65cb605e5d Fix issue #2248951: Need to turn off touch filtering outside of sholes
Yet another configuration!

Change-Id: Idf7fafd338a2bebd4c305c131cd9b7ae4f906a5b
2009-11-10 17:06:22 -08:00
Daisuke Miyakawa
0cda591125 Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Previous change selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object withouth valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.

Add a unit test for this fix.

Internal issue number: 2252304
2009-11-11 10:03:10 +09:00
Android (Google) Code Review
ae0cf6dc9e Merge change I50986dd4 into eclair
* changes:
  Make the RegisteredSErvices Cache not allow the registered service for a type to change without first uninstalling the previous service for that type, unless the newly installed service is in the system image.
2009-11-10 16:53:43 -08:00
Android (Google) Code Review
971af00305 Merge change I65208317 into eclair
* changes:
  Update OBEX to fix missing several contact entries issue.
2009-11-10 16:36:40 -08:00
Fred Quintana
5ebbb4a6b3 Make the RegisteredSErvices Cache not allow the registered service for a
type to change without first uninstalling the previous service for that
type, unless the newly installed service is in the system image.

Notify the listener when a service is added or removed.

Make the AccountManagerService remove the accounts for an authenticator
when the registered authenticator changes from one uid to another.

Make the AbstractSyncableContentProvider force a sync when the database is first created.
2009-11-10 16:10:54 -08:00
Lixin Yue
65208317ba Update OBEX to fix missing several contact entries issue.
The third parameter count of PrivateOutputStream.write()
should be the size of vcards data plus header length, excluding the 3 bytes
for the response message and 3 bytes for the header ID and length.
Adjust the return value of getMaxPacketSize() by minus headser size, so that
applications should not get packet slipped during multiple sharing operation.
Do not set the header to null in getHeaderLength() to get PBAP PTS passed;
Per OBEX spec, for Get request:
Only the last packet need send the 0x49(End of Body);
for intermediate packets, we need to send 0x48 (Body).
If all packets use 0x49, some carkit like Nokia PD-17 will fail to download
all contacts, except data in the last packet.

Bug: 2246927
Dr No: Eastham
2009-11-10 15:34:18 -08:00
Android (Google) Code Review
48515f495b Merge change I0de7979b into eclair
* changes:
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-10 15:27:36 -08:00
Android (Google) Code Review
ba56915a71 Merge change Ie806ae6f into eclair
* changes:
  Fix multi-lock ordering issues in GLSurfaceView
2009-11-10 15:21:28 -08:00
Andreas Huber
6780d8c006 Make MediaPlayerImpl less verbose by default. 2009-11-10 13:47:45 -08:00
Grace Kloba
bb245ea7f5 Return an empty PluginList instead of null for the
deprecated getPluginList() api.

Fix http://b/issue?id=2249732
2009-11-10 13:13:24 -08:00
Dianne Hackborn
6adba2467c Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
Make sure to deliver events to the wallpaper until the final up.

Also fix behavior in the case where a window goes away while the pointer is still
down in it, which is a fairly novel situation introduced by the new lock screen.

Also add infrastructure for delivering motion events during preview.

Change-Id: I0de7979be27e00caf0b1eff794ea899a815142f6
2009-11-10 13:02:30 -08:00
Andreas Huber
d533ca61fa am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:29:34 -08:00
Android (Google) Code Review
cfe45c775d Merge change I96c4d4b3 into eclair
* changes:
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:27:53 -08:00
Andreas Huber
da440f137f Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it. 2009-11-10 12:26:26 -08:00
Mike Lockwood
e93f49b7ff am cc9a63db: Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-mr2

* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
  Add support for specifying the current LCD brightness mode to the backlight driver.
2009-11-10 12:03:10 -08:00
Mike Lockwood
cc9a63dbc2 Add support for specifying the current LCD brightness mode to the backlight driver.
This allows the driver to behave differently depending on if the lighting is being
managed by the light sensor or by a user preference.

Change-Id: I4b9325f82b7aded0ce5cfc6c07658666bbdae331
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-10 14:58:15 -05:00
Android (Google) Code Review
d71ab51a46 Merge change I3e1bdd38 into eclair-mr2
* changes:
  Transcode files again.
2009-11-10 11:53:19 -08:00
Dianne Hackborn
a300625625 am 119a7675: Merge change I83ba96fe into eclair
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-mr2

* commit '119a767565399809d222ddda6392e5e58942d5e6':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:52:51 -08:00
Android (Google) Code Review
119a767565 Merge change I83ba96fe into eclair
* changes:
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:27:05 -08:00
Gloria Wang
9d7e75eb0c am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:10 -08:00
Android (Google) Code Review
bf964e6a04 Merge change Ic060d86f into eclair
* changes:
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:04:40 -08:00
Scott Main
b262f50af9 am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2

* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:40:48 -08:00
Dirk Dougherty
aca2c4dfbf am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '84241293129423a1ebd7261e8139cfb20049535f' into eclair-mr2

* commit '84241293129423a1ebd7261e8139cfb20049535f':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:38:47 -08:00
Scott Main
13ce56bdbc am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair

* commit '88427cff609e668185010af2244500be5823595e':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:26:24 -08:00
Android (Google) Code Review
88427cff60 Merge change Ibcfb7d10 into eclair-sdk
* changes:
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:21:00 -08:00
Dirk Dougherty
8424129312 am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '3a103a87b0b3b0e9055f32e1c7f0ec3a58456bad' into eclair

* commit '3a103a87b0b3b0e9055f32e1c7f0ec3a58456bad':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:20:55 -08:00
Android (Google) Code Review
3a103a87b0 Merge change I15536f3c into eclair-sdk
* changes:
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:13:29 -08:00
Dirk Dougherty
a374f51f18 doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Bug: 2246467
Change-Id: I15536f3c7f2088fff8f60963ba23a69b1be43804
2009-11-10 08:41:20 -08:00
Mike Lockwood
07e7e3f4be am 50c548d2: Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-mr2

* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
  Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
2009-11-10 07:17:18 -08:00
Mike Lockwood
50c548d242 Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
This is part of a fix for bug b/2248320 (Lock screen does not time out after

Change-Id: Iba7f8a7b9997ecb0e4da37667600055f9a35531c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-10 10:04:21 -05:00
Mike Lockwood
245eaeedf8 am ee2b094d: Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-mr2

* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
  Do not deactivate the proximity sensor until after the sensor returns negative.
2009-11-10 05:01:02 -08:00
Mike Lockwood
ee2b094de0 Do not deactivate the proximity sensor until after the sensor returns negative.
This ensures that we do not get cheek presses immediately after a call is ended.
Fixes bug b/2246824 (prox sensor subtleties when call ends)

Change-Id: I97d39b7689d9ea2e94ea9aceeb93bf15228ec095
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-10 07:55:32 -05:00
Mike Lockwood
e4fed7dc24 am de342a01: Merge change Idcd98310 into eclair
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-mr2

* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
  PowerManagerService: enable logging for when mPowerState changes.
2009-11-10 04:38:57 -08:00
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
0b9d3ba2fe am c421fc2a: Merge change Id09376d1 into eclair
Merge commit 'c421fc2ada7c1bff104733b840bd640151bebbbb' into eclair-mr2

* commit 'c421fc2ada7c1bff104733b840bd640151bebbbb':
  fix [2071412] work around mdp 32-bits fade limitation
2009-11-09 19:34:59 -08:00
Marco Nelissen
949ffa3da5 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:42 -08:00