11954 Commits

Author SHA1 Message Date
Daisuke Miyakawa
a4b8a30ccb am 49fc4a9d: am fe17db4c: (-s ours) Merge change I4db11d50 into eclair
Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp

* commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-11 17:25:42 -08:00
Daisuke Miyakawa
49fc4a9dd3 am fe17db4c: (-s ours) Merge change I4db11d50 into eclair
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2

* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
2009-11-11 17:09:39 -08:00
Fred Quintana
7efa671569 am e871be66: Merge change I735f4553 into eclair-mr2
Merge commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4' into eclair-mr2-plus-aosp

* commit 'e871be666b80d3f6a9a9a44ee400ab661be212e4':
  Make the RegisteredSErvices Cache not allow the registered service for a
2009-11-11 17:05:01 -08:00
Android (Google) Code Review
e871be666b Merge change I735f4553 into eclair-mr2
* changes:
  resolved conflicts for merge of ae0cf6dc to eclair-mr2
2009-11-11 17:00:23 -08:00
Fred Quintana
735f455386 resolved conflicts for merge of ae0cf6dc to eclair-mr2 2009-11-11 16:18:46 -08:00
Dan Egnor
802f58da80 am 6139bf60: Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
Merge commit '6139bf60e83753750fa1009de6da85033dad1820' into eclair-mr2-plus-aosp

* commit '6139bf60e83753750fa1009de6da85033dad1820':
  Add AGGREGATION_INTERVAL_SECONDS (fixing the build)
2009-11-11 15:52:20 -08:00
Lixin Yue
3ef009d30b am cf250733: am 971af003: Merge change I65208317 into eclair
Merge commit 'cf25073348eda15ba5d6ceee1a65ac1386a627a1' into eclair-mr2-plus-aosp

* commit 'cf25073348eda15ba5d6ceee1a65ac1386a627a1':
  Update OBEX to fix missing several contact entries issue.
2009-11-11 15:52:08 -08:00
Dianne Hackborn
6c82b7fe24 am acbd9fda: am 48515f49: Merge change I0de7979b into eclair
Merge commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4' into eclair-mr2-plus-aosp

* commit 'acbd9fdaf02ff14c873ce23cfa95afc71af69ae4':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
2009-11-11 15:51:57 -08:00
Dan Egnor
6139bf60e8 Add AGGREGATION_INTERVAL_SECONDS (fixing the build) 2009-11-11 15:46:32 -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
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 Palevich
99cf71b085 am 83536cee: Merge change I1179efbb into eclair-mr2
Merge commit '83536cee2b2b5445c5ba0b22531c23890b82da41' into eclair-mr2-plus-aosp

* commit '83536cee2b2b5445c5ba0b22531c23890b82da41':
  Fix multi-lock ordering issues in GLSurfaceView
2009-11-10 18:06:05 -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
Daisuke Miyakawa
fbac9bdfd4 am 0cda5911: Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Merge commit '0cda59112526c03f3b8be0eb885926b7515df756' into eclair-mr2-plus-aosp

* commit '0cda59112526c03f3b8be0eb885926b7515df756':
  Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
2009-11-10 17:14:08 -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
555ecc7d8e am 6780d8c0: Make MediaPlayerImpl less verbose by default.
Merge commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6' into eclair-mr2-plus-aosp

* commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6':
  Make MediaPlayerImpl less verbose by default.
2009-11-10 13:55:12 -08:00
Andreas Huber
6780d8c006 Make MediaPlayerImpl less verbose by default. 2009-11-10 13:47:45 -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
00443d661d am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp

* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
  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:33:53 -08:00
Mike Lockwood
f30404929e am e93f49b7: am cc9a63db: Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a' into eclair-mr2-plus-aosp

* commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a':
  Add support for specifying the current LCD brightness mode to the backlight driver.
2009-11-10 12:33:42 -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
Andreas Huber
45e89568b6 am d71ab51a: Merge change I3e1bdd38 into eclair-mr2
Merge commit 'd71ab51a46d3648493ab3425e77e5762544be03a' into eclair-mr2-plus-aosp

* commit 'd71ab51a46d3648493ab3425e77e5762544be03a':
  Transcode files again.
2009-11-10 11:55:40 -08: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
7377ac4fa5 am a3006256: am 119a7675: Merge change I83ba96fe into eclair
Merge commit 'a300625625feae9f7eb28694e4a31335442c420b' into eclair-mr2-plus-aosp

* commit 'a300625625feae9f7eb28694e4a31335442c420b':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 11:00:00 -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
28b0e31195 am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp

* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:11:21 -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
8e5cee5d26 am b262f50a: am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56' into eclair-mr2-plus-aosp

* commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:44:19 -08:00
Dirk Dougherty
bd079ec854 am aca2c4df: am 84241293: am 3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit 'aca2c4dfbf0c92424cb9325976bbd9d81c16501b' into eclair-mr2-plus-aosp

* commit 'aca2c4dfbf0c92424cb9325976bbd9d81c16501b':
  doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
2009-11-10 09:44:08 -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