7264 Commits

Author SHA1 Message Date
Suchi Amalapurapu
cac1f0dff1 am c067ef5f: am 580a2921: Merge change 22945 into eclair
Merge commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c'

* commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c':
  Add a null check in PackageParser
2009-08-27 12:42:18 -07:00
Suchi Amalapurapu
c067ef5f5a am 580a2921: Merge change 22945 into eclair
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp

* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
  Add a null check in PackageParser
2009-08-27 12:40:11 -07:00
Android (Google) Code Review
580a292108 Merge change 22945 into eclair
* changes:
  Add a null check in PackageParser
2009-08-27 12:37:47 -07:00
Dianne Hackborn
f2dc33b47e am eba188e2: am aa0a3b09: Merge change 22944 into eclair
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'

* commit 'eba188e21c752d98f03215eb15822bd39c462664':
  Various tweaks to try to improve low memory behavior.
2009-08-27 12:30:50 -07:00
Dianne Hackborn
eba188e21c am aa0a3b09: Merge change 22944 into eclair
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp

* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
  Various tweaks to try to improve low memory behavior.
2009-08-27 12:29:45 -07:00
Suchi Amalapurapu
c748541ca0 Add a null check in PackageParser 2009-08-27 12:28:09 -07:00
Android (Google) Code Review
aa0a3b09e7 Merge change 22944 into eclair
* changes:
  resolved conflicts for merge of 301b97ac to eclair
2009-08-27 12:27:51 -07:00
Dianne Hackborn
6ccd2aff3e resolved conflicts for merge of 301b97ac to eclair
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
2009-08-27 12:26:44 -07:00
Eric Laurent
2baee5bc11 am 50899001: am bc86bda4: Merge change 22897 into eclair
Merge commit '508990016a238b65ac657bc4c832cc732af20906'

* commit '508990016a238b65ac657bc4c832cc732af20906':
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:41:50 -07:00
Dmitri Plotnikov
413ae88b69 am e19e5261: am 763ea918: Merge change 22919 into eclair
Merge commit 'e19e5261159ac84517caf40f61f4e870f9965f6c'

* commit 'e19e5261159ac84517caf40f61f4e870f9965f6c':
  Removing "summary"-style URIs.
2009-08-27 11:41:45 -07:00
Eric Laurent
508990016a am bc86bda4: Merge change 22897 into eclair
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp

* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:38:29 -07:00
Dmitri Plotnikov
e19e526115 am 763ea918: Merge change 22919 into eclair
Merge commit '763ea918fc7954eab422dc3baf578a2368737637' into eclair-plus-aosp

* commit '763ea918fc7954eab422dc3baf578a2368737637':
  Removing "summary"-style URIs.
2009-08-27 11:38:26 -07:00
Android (Google) Code Review
bc86bda499 Merge change 22897 into eclair
* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:37:35 -07:00
Android (Google) Code Review
763ea918fc Merge change 22919 into eclair
* changes:
  Removing "summary"-style URIs.
2009-08-27 11:36:36 -07:00
Mike Lockwood
3ef61c4479 am 569e114a: am 25b9cec8: Merge change 22692 into eclair
Merge commit '569e114aa7d32c05ac64311b0bc545969c9b6893'

* commit '569e114aa7d32c05ac64311b0bc545969c9b6893':
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:30:53 -07:00
Mike Lockwood
569e114aa7 am 25b9cec8: Merge change 22692 into eclair
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp

* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:28:53 -07:00
Android (Google) Code Review
25b9cec8de Merge change 22692 into eclair
* changes:
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:26:44 -07:00
Andreas Huber
62faa36a2e am 649092ad: am e0daf804: Merge change 22921 into eclair
Merge commit '649092ad53f2fe63ac169196ae916377abfeb4da'

* commit '649092ad53f2fe63ac169196ae916377abfeb4da':
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:23:01 -07:00
Andreas Huber
649092ad53 am e0daf804: Merge change 22921 into eclair
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp

* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:21:02 -07:00
Android (Google) Code Review
1fa1be71c6 Merge change 22930
* changes:
  Edit XML file to reflect HashMap and LinkedHash API.
2009-08-27 11:19:32 -07:00
Android (Google) Code Review
e0daf8043f Merge change 22921 into eclair
* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:18:36 -07:00
Joshua Bloch
8ea776cbf2 Edit XML file to reflect HashMap and LinkedHash API. 2009-08-27 11:17:10 -07:00
Jaikumar Ganesh
ecf2452342 am 2246bc54: am 6ff90cf2: Merge change 22870 into eclair
Merge commit '2246bc54fa82b7a2531deeb2ac9563d0e773dd03'

* commit '2246bc54fa82b7a2531deeb2ac9563d0e773dd03':
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:12:13 -07:00
Jaikumar Ganesh
2246bc54fa am 6ff90cf2: Merge change 22870 into eclair
Merge commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7' into eclair-plus-aosp

* commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7':
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:10:16 -07:00
Android (Google) Code Review
6ff90cf2b3 Merge change 22870 into eclair
* changes:
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:08:55 -07:00
Mike Lockwood
36fc302560 PowerManagerService: Disallow all user activity when in proximity wake lock.
Fixes b/2076756

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-27 11:07:49 -07:00
Jaikumar Ganesh
78333dd750 Set Routing to A2DP only when state is Connected.
We were setting the routing to A2DP when the state was Connecting too.
This was incorrect and can cause problems. One such problem was when
handling an incoming connection we set the routing to A2DP before
authorization. And even if authorization succeeds we get out sync with
AVDTP command state.
2009-08-27 11:03:00 -07:00
Ye Wen
900e50e43b am 0b05e730: am 4d5b4225: Merge change 22795 into eclair
Merge commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c'

* commit '0b05e730fe45e7dd22113a8c89cff879d7a3d53c':
  The Gservices settings for pruning messages/chats.
2009-08-27 11:02:59 -07:00
Ye Wen
0b05e730fe am 4d5b4225: Merge change 22795 into eclair
Merge commit '4d5b4225e492f3de543efa195204f38d03a6721a' into eclair-plus-aosp

* commit '4d5b4225e492f3de543efa195204f38d03a6721a':
  The Gservices settings for pruning messages/chats.
2009-08-27 11:00:09 -07:00
Android (Google) Code Review
4d5b4225e4 Merge change 22795 into eclair
* changes:
  The Gservices settings for pruning messages/chats.
2009-08-27 10:58:25 -07:00
Romain Guy
4bec2cfa25 am db978b1f: am ed48c808: Merge change 22920 into eclair
Merge commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f'

* commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f':
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:48:13 -07:00
Romain Guy
db978b1f8d am ed48c808: Merge change 22920 into eclair
Merge commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4' into eclair-plus-aosp

* commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4':
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:45:38 -07:00
Android (Google) Code Review
ed48c8081c Merge change 22920 into eclair
* changes:
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:43:18 -07:00
Romain Guy
e55e1a7885 Change fade to use a gradient from opaque color to transparent color.
Previously the fade was using a gradient from opaque color to transparent black.
2009-08-27 10:42:26 -07:00
Andreas Huber
42978e55fe An attempt to fix a deadlock between OMXCodec::start and upstream ::read 2009-08-27 10:41:13 -07:00
Dmitri Plotnikov
b87d0e0e57 Removing "summary"-style URIs.
We will determine whether to include Presence by looking at the requested projection.
2009-08-27 10:38:14 -07:00
Ye Wen
48f886e661 The Gservices settings for pruning messages/chats. 2009-08-27 10:34:22 -07:00
Andreas Huber
cfea8904c9 am b24a6a12: am 650b872c: Merge change 22830 into eclair
Merge commit 'b24a6a1267bd59a320d99fd8a33e44608fc3f5bc'

* commit 'b24a6a1267bd59a320d99fd8a33e44608fc3f5bc':
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:14:42 -07:00
Andreas Huber
b24a6a1267 am 650b872c: Merge change 22830 into eclair
Merge commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0' into eclair-plus-aosp

* commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0':
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:12:10 -07:00
Android (Google) Code Review
650b872c5a Merge change 22830 into eclair
* changes:
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:10:07 -07:00
Mike Lockwood
db9b0c5705 am 7fdaaa5b: am 49c22570: am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7fdaaa5b46a8f96a3667c9acd585e4352d12fb11'

* commit '7fdaaa5b46a8f96a3667c9acd585e4352d12fb11':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:29:44 -07:00
Mike Lockwood
7fdaaa5b46 am 49c22570: am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp

* commit '49c22570bb8717bb678dbd8bae6692bb585370fc':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:28:11 -07:00
Mike Lockwood
49c22570bb am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair

* commit '7566c1debebe072af76411e11d96810fd1409482':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:25:36 -07:00
Steve Block
dead6a4959 am 07a0ba4d: am 09b0ca1c: Sets default value of \'enableGeolocation\' to true. This allows WebKit\'s DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser\'s default anyway.
Merge commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab'

* commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab':
  Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
2009-08-27 08:52:47 -07:00
Steve Block
07a0ba4dc9 am 09b0ca1c: Sets default value of \'enableGeolocation\' to true. This allows WebKit\'s DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser\'s default anyway.
Merge commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f' into eclair-plus-aosp

* commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f':
  Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
2009-08-27 08:50:19 -07:00
Steve Block
09b0ca1cee Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway. 2009-08-27 16:17:20 +01:00
Steve Block
d047734638 am 6a538f3f: am 7537e3dc: Merge change 22453 into eclair
Merge commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b'

* commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b':
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:47:59 -07:00
Steve Block
6a538f3fca am 7537e3dc: Merge change 22453 into eclair
Merge commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e' into eclair-plus-aosp

* commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e':
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:45:46 -07:00
Android (Google) Code Review
7537e3dc91 Merge change 22453 into eclair
* changes:
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:43:36 -07:00
Eric Laurent
327c27be19 Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Add the possibility to delay routing and volume commands in AudioPolicyClientInterface. The delay is not blocking for the caller.
2009-08-27 05:58:10 -07:00