Commit Graph

7328 Commits

Author SHA1 Message Date
Andreas Huber
64af85deb1 am 1a66583f: am bf8ecd7c: Merge change 22991 into eclair
Merge commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389'

* commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389':
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:38:14 -07:00
Andreas Huber
1a66583fea am bf8ecd7c: Merge change 22991 into eclair
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp

* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:35:43 -07:00
Android (Google) Code Review
bf8ecd7c7e Merge change 22991 into eclair
* changes:
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:34:15 -07:00
Robert Greenwalt
855af2c659 am 870333b1: am 29418e98: Merge change 22529 into eclair
Merge commit '870333b1e3f423609c0861c74c3fc2d878b7c58b'

* commit '870333b1e3f423609c0861c74c3fc2d878b7c58b':
  Track apn Enable synchronously and notice failures
2009-08-27 16:21:59 -07:00
Fred Quintana
4cf7ef6387 am 3aad3ae2: am a640c49e: Merge change 22984 into eclair
Merge commit '3aad3ae2f9460a17ae4a7a8099f4746e79a9502c'

* commit '3aad3ae2f9460a17ae4a7a8099f4746e79a9502c':
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:21:54 -07:00
Robert Greenwalt
870333b1e3 am 29418e98: Merge change 22529 into eclair
Merge commit '29418e98731b4a5f94d9ac5f4a0df9d5d21bca55' into eclair-plus-aosp

* commit '29418e98731b4a5f94d9ac5f4a0df9d5d21bca55':
  Track apn Enable synchronously and notice failures
2009-08-27 16:20:24 -07:00
Fred Quintana
3aad3ae2f9 am a640c49e: Merge change 22984 into eclair
Merge commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6' into eclair-plus-aosp

* commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6':
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:20:17 -07:00
Android (Google) Code Review
29418e9873 Merge change 22529 into eclair
* changes:
  Track apn Enable synchronously and notice failures
2009-08-27 16:18:50 -07:00
Android (Google) Code Review
a640c49eda Merge change 22984 into eclair
* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:18:14 -07:00
Eric Fischer
1f9e05ed2d am d5181adf: am bfa1d083: Merge change 22962 into eclair
Merge commit 'd5181adf0f6da705a39987f3271d2833f2136a08'

* commit 'd5181adf0f6da705a39987f3271d2833f2136a08':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:06:45 -07:00
Eric Fischer
d5181adf0f am bfa1d083: Merge change 22962 into eclair
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp

* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:04:06 -07:00
Android (Google) Code Review
bfa1d083aa Merge change 22962 into eclair
* changes:
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:01:59 -07:00
Android (Google) Code Review
bfc3c06d14 Merge change 22990
* changes:
  Fix preloaded classes file to reflect new implementation of HashMap. And Linked HashMap.
2009-08-27 15:28:38 -07:00
Andreas Huber
813a875286 Apparently setting the preferred role of the OMX component is now required on this platform. 2009-08-27 15:28:12 -07:00
Andreas Huber
34e3e4c9fa am a7f5f38a: am c1dccce7: Merge change 22986 into eclair
Merge commit 'a7f5f38a41a918fe9a59906f0171635ec61ea027'

* commit 'a7f5f38a41a918fe9a59906f0171635ec61ea027':
  Squashed commit of the following:
2009-08-27 15:28:04 -07:00
Dianne Hackborn
e480ce425f am 6f664bd8: am d6ac7c73: Merge change 22975 into eclair
Merge commit '6f664bd89da4c9a3fdbee7ad784750cd868e4b41'

* commit '6f664bd89da4c9a3fdbee7ad784750cd868e4b41':
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:27:59 -07:00
Andreas Huber
a7f5f38a41 am c1dccce7: Merge change 22986 into eclair
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp

* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
  Squashed commit of the following:
2009-08-27 15:26:09 -07:00
Dianne Hackborn
6f664bd89d am d6ac7c73: Merge change 22975 into eclair
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp

* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:26:05 -07:00
Joshua Bloch
991f5af3e7 Fix preloaded classes file to reflect new implementation of HashMap.
And Linked HashMap.
2009-08-27 15:26:03 -07:00
Android (Google) Code Review
c1dccce741 Merge change 22986 into eclair
* changes:
  Squashed commit of the following:
2009-08-27 15:24:35 -07:00
Android (Google) Code Review
d6ac7c73e1 Merge change 22975 into eclair
* changes:
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:10:27 -07:00
Andreas Huber
3616a4a7f0 am f110ec43: am 5352e237: Merge change 22968 into eclair
Merge commit 'f110ec4395ae1aa8f6766849125f9e2e6bfa06b0'

* commit 'f110ec4395ae1aa8f6766849125f9e2e6bfa06b0':
  Fix a typo.
2009-08-27 14:57:03 -07:00
Andreas Huber
f110ec4395 am 5352e237: Merge change 22968 into eclair
Merge commit '5352e237cad365f39c87aaeda3822c891c7ca474' into eclair-plus-aosp

* commit '5352e237cad365f39c87aaeda3822c891c7ca474':
  Fix a typo.
2009-08-27 14:55:15 -07:00
Android (Google) Code Review
5352e237ca Merge change 22968 into eclair
* changes:
  Fix a typo.
2009-08-27 14:54:13 -07:00
Andreas Huber
329577aa6d Squashed commit of the following:
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:48:54 2009 -0700

    Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:33:06 2009 -0700

    Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
2009-08-27 14:50:58 -07:00
Eric Fischer
b2795f46bf Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I5738ea969ce233c15550d572fbdb5e62108c1e3e
2009-08-27 14:49:54 -07:00
Dianne Hackborn
145781c604 am 3d62b715: am fa526029: am f734e027: Merge change 22939 into donut
Merge commit '3d62b71514bdb1c7f6e75e3a6a5f1811d755a541'

* commit '3d62b71514bdb1c7f6e75e3a6a5f1811d755a541':
  Final Donut API list.
2009-08-27 14:45:22 -07:00
Fred Quintana
b19b4c711f fix AbstractThreadedSyncAdapter to actually cancel syncs 2009-08-27 14:43:01 -07:00
Dianne Hackborn
3d62b71514 am fa526029: am f734e027: Merge change 22939 into donut
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp

* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
  Final Donut API list.
2009-08-27 14:42:30 -07:00
Dianne Hackborn
fa5260290f am f734e027: Merge change 22939 into donut
Merge commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8' into eclair

* commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8':
  Final Donut API list.
2009-08-27 14:40:51 -07:00
Mike Lockwood
e684e98466 am fb8910f9: am 6391830d: Merge change 22958 into eclair
Merge commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'

* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:34:58 -07:00
Mike Lockwood
fb8910f958 am 6391830d: Merge change 22958 into eclair
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp

* commit '6391830d103ccb19465c69660065c22c2711dcfd':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:32:55 -07:00
Android (Google) Code Review
6391830d10 Merge change 22958 into eclair
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:31:06 -07:00
Mike Lockwood
b90329a993 am e1ecb7df: am 18ad9f65: Only allow system code to call LocationManager.sendNiResponse()
Merge commit 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb'

* commit 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb':
  Only allow system code to call LocationManager.sendNiResponse()
2009-08-27 14:26:14 -07:00
Mike Lockwood
e1ecb7dfe9 am 18ad9f65: Only allow system code to call LocationManager.sendNiResponse()
Merge commit '18ad9f657bda79069233c0b8e1476888ffd894d4' into eclair-plus-aosp

* commit '18ad9f657bda79069233c0b8e1476888ffd894d4':
  Only allow system code to call LocationManager.sendNiResponse()
2009-08-27 14:24:43 -07:00
Mike Lockwood
18ad9f657b Only allow system code to call LocationManager.sendNiResponse()
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 14:22:27 -07:00
Danke Xie
1a27bfa8d8 am 18070866: am 22d1f9fb: gps: Network initiated SUPL
Merge commit '18070866622146c053a0abc5d51d116e61986b25'

* commit '18070866622146c053a0abc5d51d116e61986b25':
  gps: Network initiated SUPL
2009-08-27 14:22:24 -07:00
Danke Xie
1807086662 am 22d1f9fb: gps: Network initiated SUPL
Merge commit '22d1f9fb23015471de6af1a70e40fb5c82ecb665' into eclair-plus-aosp

* commit '22d1f9fb23015471de6af1a70e40fb5c82ecb665':
  gps: Network initiated SUPL
2009-08-27 14:20:55 -07:00
Dianne Hackborn
6c3f571a14 Fix issue #2069662: The wallpaper doesn't move along with the home screen
The wallpaper target was being lost when an activity was restarted.

Change-Id: Ib05622591c9bb2f01bb8f2c0a0a8e77fe657ae88
2009-08-27 14:18:51 -07:00
Danke Xie
22d1f9fb23 gps: Network initiated SUPL
Initial contribution from Qualcomm.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 14:18:30 -07:00
Andreas Huber
3986afef0c Fix a typo. 2009-08-27 14:05:47 -07:00
Jesse Wilson
8364788c61 am e9851927: am 0409cde3: Updating synchronized to match x-net changes
Merge commit 'e985192744283593163fdfb49faadedbdd188360'

* commit 'e985192744283593163fdfb49faadedbdd188360':
  Updating synchronized to match x-net changes
2009-08-27 13:36:47 -07:00
Jesse Wilson
e985192744 am 0409cde3: Updating synchronized to match x-net changes
Merge commit '0409cde3601131caf14c88d132c65d74774bbd79' into eclair-plus-aosp

* commit '0409cde3601131caf14c88d132c65d74774bbd79':
  Updating synchronized to match x-net changes
2009-08-27 13:34:37 -07:00
Jesse Wilson
0409cde360 Updating synchronized to match x-net changes 2009-08-27 13:31:04 -07:00
Mike Lockwood
ddfe879b78 Don't activate keyguard if screen is turned off while proximity sensor is active.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 13:27:08 -07:00
Dianne Hackborn
7bb023b4ce am c56a4111: am 1e0f7627: Merge change 22673 into eclair
Merge commit 'c56a411120772f17ed4fbc2f3636114cd3c48e4c'

* commit 'c56a411120772f17ed4fbc2f3636114cd3c48e4c':
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:14:37 -07:00
Andreas Huber
75ad91662e am bb1f8a5a: am e18d4d01: Merge change 22938 into eclair
Merge commit 'bb1f8a5a999e13bf6c307d575fab9f8e83a367e6'

* commit 'bb1f8a5a999e13bf6c307d575fab9f8e83a367e6':
  Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
2009-08-27 13:14:33 -07:00
Dianne Hackborn
c56a411120 am 1e0f7627: Merge change 22673 into eclair
Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp

* commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56':
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:12:31 -07:00
Andreas Huber
bb1f8a5a99 am e18d4d01: Merge change 22938 into eclair
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp

* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
  Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
2009-08-27 13:12:28 -07:00
Android (Google) Code Review
1e0f762738 Merge change 22673 into eclair
* changes:
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:10:54 -07:00