Commit Graph

38903 Commits

Author SHA1 Message Date
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
Fred Quintana
cfcb8d6fcc am 561aaedc: am 3cff76aa: make sure that the sync thread is protected by a consistent lock
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1'

* commit '561aaedc0220db09d660c29d8237eb937373a7c1':
  make sure that the sync thread is protected by a consistent lock
2009-08-27 02:10:50 -07:00
Fred Quintana
561aaedc02 am 3cff76aa: make sure that the sync thread is protected by a consistent lock
Merge commit '3cff76aaa893049d02467a231d477e86a0f80daa' into eclair-plus-aosp

* commit '3cff76aaa893049d02467a231d477e86a0f80daa':
  make sure that the sync thread is protected by a consistent lock
2009-08-27 02:08:28 -07:00
Fred Quintana
3cff76aaa8 make sure that the sync thread is protected by a consistent lock 2009-08-27 01:46:08 -07:00
Android (Google) Code Review
301b97ac19 Merge change 22883 into donut
* changes:
  Various tweaks to try to improve low memory behavior.
2009-08-27 01:14:00 -07:00
Dianne Hackborn
fd12af4e76 Various tweaks to try to improve low memory behavior.
- Reduce the amount that we ask processes to GC after a significant
  operation occurs, but introducing a minimum time between GCs and
  using this in various ways to schedule them.

- Don't spam all of the processes with onLowMemory().  Now deliver
  these using the same gc facility, so we do the processes one at a
  time, and don't allow the same process to get this call more than
  once a minute.

- Increase the time a service must run before we will reset its
  restart delay to 30 minutes (from 10).

- Increase the restart delay multiplication factor from 2 to 4.

- Ensure that we don't restart more than one service every 10 seconds
  (unless some external event causes a service's process to be started
  for some other reason of course).

- Increase the amount of time that a service must run before we
  decide to lower it to a background process.

And some other things:

- Catch IllegalArgumentException in ViewRoot like we do for no
  resources to avoid the system process crashing.

- Fix a number of places where we were missing breaks between the
  activity manager's message dispatch func(!!).

- Fix reason printed for processes in the background.

- Print the list of processing waiting to GC.
2009-08-27 01:03:24 -07:00
Mike Lockwood
7566c1debe LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-26 23:34:18 -07:00
Dan Murphy
a9e0f7787f am 9dfc244a: am 42b16482: Add option to allow no-unlock-on-slider-open
Merge commit '9dfc244ae4b1b9994fab20659aa29455240b3272'

* commit '9dfc244ae4b1b9994fab20659aa29455240b3272':
  Add option to allow no-unlock-on-slider-open
2009-08-26 21:03:46 -07:00
Dan Murphy
168b0a95fe am 1cdcc3cc: policy/impl: Add option to disable screen-unlock-on-slider-open
Merge commit '1cdcc3cc653432b6f479d4759ebb01bbb93ae278'

* commit '1cdcc3cc653432b6f479d4759ebb01bbb93ae278':
  policy/impl: Add option to disable screen-unlock-on-slider-open
2009-08-26 21:02:24 -07:00
Dan Murphy
9dfc244ae4 am 42b16482: Add option to allow no-unlock-on-slider-open
Merge commit '42b1648212d31dbc63518ca8379f145fef1efcb8' into eclair-plus-aosp

* commit '42b1648212d31dbc63518ca8379f145fef1efcb8':
  Add option to allow no-unlock-on-slider-open
2009-08-26 21:01:02 -07:00
Dan Murphy
42b1648212 Add option to allow no-unlock-on-slider-open
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
2009-08-26 20:57:17 -07:00
Hung-ying Tyan
54bef0bc89 am 8464eb2e: am d21a04c0: Merge change 21259 into eclair
Merge commit '8464eb2eaba5383006b3590d6a7baeec8e9872a8'

* commit '8464eb2eaba5383006b3590d6a7baeec8e9872a8':
  Make certificate-handling-related constants public
2009-08-26 20:33:47 -07:00
Hung-ying Tyan
8464eb2eab am d21a04c0: Merge change 21259 into eclair
Merge commit 'd21a04c06c0d9b1cb401c30bf6da778010872957' into eclair-plus-aosp

* commit 'd21a04c06c0d9b1cb401c30bf6da778010872957':
  Make certificate-handling-related constants public
2009-08-26 20:31:29 -07:00
Android (Google) Code Review
d21a04c06c Merge change 21259 into eclair
* changes:
  Make certificate-handling-related constants public
2009-08-26 20:29:17 -07:00
Amith Yamasani
16c7d92950 am c66f5ebf: am ed5fede3: Merge change 22667 into eclair
Merge commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb'

* commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb':
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 18:03:59 -07:00
Amith Yamasani
c66f5ebf42 am ed5fede3: Merge change 22667 into eclair
Merge commit 'ed5fede3f8a376ebed46beeb41796838847ad68d' into eclair-plus-aosp

* commit 'ed5fede3f8a376ebed46beeb41796838847ad68d':
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 18:01:46 -07:00
Android (Google) Code Review
ed5fede3f8 Merge change 22667 into eclair
* changes:
  Fix rare NPE due to key being delivered after activity is stopped. #2062930
2009-08-26 17:59:26 -07:00
Mathias Agopian
7b262d534e am 1775d3b4: am eafcadca: Merge change 22841 into eclair
Merge commit '1775d3b4150ff3961988ba392d0446c73a981f25'

* commit '1775d3b4150ff3961988ba392d0446c73a981f25':
  dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked
2009-08-26 17:43:04 -07:00
Mathias Agopian
1775d3b415 am eafcadca: Merge change 22841 into eclair
Merge commit 'eafcadca7a69ac49d5484d04badcc8ccf177a5f3' into eclair-plus-aosp

* commit 'eafcadca7a69ac49d5484d04badcc8ccf177a5f3':
  dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked
2009-08-26 17:41:56 -07:00
Android (Google) Code Review
eafcadca7a Merge change 22841 into eclair
* changes:
  dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked (in this case the state is dumped without the proper locks held which could result to a crash)
2009-08-26 17:40:56 -07:00