22829 Commits

Author SHA1 Message Date
Dirk Dougherty
31e4f45eba am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken

* commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:49:37 -07:00
Scott Main
25d2406176 am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken

* commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
  docs: add default value and compatibility info for installLocation
2010-05-10 09:49:34 -07:00
Scott Main
3d3853a618 am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken

* commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673':
  docs: revisions to the new resources doc based on editorial feedback
2010-05-10 09:49:30 -07:00
Andreas Huber
248597ae64 am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
2010-05-10 09:49:24 -07:00
Mathias Agopian
4cfc21ecd9 am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken

* commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
2010-05-10 09:49:19 -07:00
Dirk Dougherty
47de84c359 am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken

* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
2010-05-10 09:49:13 -07:00
Dan Egnor
5610c2871b am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp

* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
  Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:43:53 -07:00
Dirk Dougherty
e4682e8ae7 am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp

* commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:43:50 -07:00
Scott Main
fe5921aa7e am c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit 'c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp

* commit 'c4c42eef9a62846a152094d61987e6dd2728e417':
  docs: add default value and compatibility info for installLocation
2010-05-10 09:43:47 -07:00
Scott Main
d2f2a80e9f am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp

* commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420':
  docs: revisions to the new resources doc based on editorial feedback
2010-05-10 09:43:35 -07:00
Andreas Huber
1707851090 am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp

* commit 'd13efb20089e44e6958cb9704864c03821f19e1c':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
2010-05-10 09:43:26 -07:00
Mathias Agopian
56aed6bde0 am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit 'c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp

* commit 'c69775d616c25d31dcea119ab1e7af19148853e2':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
2010-05-10 09:43:23 -07:00
Dirk Dougherty
aff856d053 am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp

* commit '0dd3a239519369933d4efa701479c816b4b33874':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
2010-05-10 09:43:03 -07:00
Jean-Baptiste Queru
0a26aaad8b Merge "long modifier was on the wrong argument." 2010-05-10 08:55:17 -07:00
Chih-Chung Chang
979d5c9b7d am dc3e2607: Force sooner/generic/sim to use camera stub only. 2010-05-10 00:18:18 -07:00
Wu-cheng Li
ca09961484 Add continuous focus mode constant.
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
2010-05-10 15:14:56 +08:00
Chih-Chung Chang
dc3e260713 Force sooner/generic/sim to use camera stub only.
Change-Id: Ie3251e3801cd09b3f373bbd4afb5fda82a0c5818
2010-05-10 15:04:40 +08:00
Chih-Chung Chang
8f21d23365 am 7768892c: Fix for build without a hardware camera. 2010-05-09 23:47:56 -07:00
Chih-Chung Chang
7768892c82 Fix for build without a hardware camera.
Change-Id: Ib5a0b58ea9e02ae1df9d258de541726189147567
2010-05-10 14:36:24 +08:00
Chih-Chung Chang
c2ed181788 am e25cc656: Support multiple cameras in framework. 2010-05-09 20:42:41 -07:00
Chih-Chung Chang
e25cc65639 Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
2010-05-10 11:21:14 +08:00
Dan Egnor
7d16737668 Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-09 07:03:46 -07:00
Robert Greenwalt
ebdbc7ec11 String change to refer to wifi tether as hotspot
bug:2664412
Change-Id: I9ab110f88551d03a9215b81887675c50aa575d9a
2010-05-08 15:07:53 -07:00
Dirk Dougherty
fb70ffd993 Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-07 21:07:57 -07:00
Joe Malin
902054336e Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Change-Id: Ie94632bc7becb3b388d1ecb01512ce29efc04208
2010-05-07 21:04:31 -07:00
Dirk Dougherty
37627b9fd1 Doc change: Final api diffs 7 -> 8.
Change-Id: Ie4b13f6b85439009f8236f8c082ca28021aa9b0c
2010-05-07 17:11:18 -07:00
Scott Main
c4c42eef9a docs: add default value and compatibility info for installLocation
Change-Id: I2336bc0c7edb68a0c452e44633a8163a2798d7de
2010-05-07 15:30:15 -07:00
Scott Main
c6cb8a78d0 docs: revisions to the new resources doc based on editorial feedback
plus some fixes to resource references and other misc revisions

Change-Id: I7b498858d9d0ecfd8cf9bad48c08c93047d597b8
2010-05-07 15:18:49 -07:00
Scott Main
bf1d0b900e docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Change-Id: Ic240502b8874fdc69d1d97cbf9df0ef925fbc071
2010-05-07 15:08:36 -07:00
Andreas Huber
d13efb2008 Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-07 13:47:42 -07:00
Mathias Agopian
c69775d616 Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-07 13:39:29 -07:00
Jean-Baptiste Queru
561b1e42c7 Merge "Added WEB_URL_PATTERN for Montenegro ".me"" 2010-05-07 12:57:02 -07:00
Andreas Huber
388379f8b4 A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
2010-05-07 12:01:45 -07:00
Brad Larson
86568d705e Use isLocationProviderEnabled to test for enabled providers
LocationManagerService was just checking if the string of (comma-separated)
Location Providers contained the provider we were interested in.  This works
fine in normal cases, but breaks if we add a provider such as test_network.
Enabling test_network causes LocationManagerService to think that the network
provider is also enabled.

The code in Settings.Secure.isLocationProviderEnabled() checks for the commas
in the string as well, to make sure that a provider name which is a substring
of another provider name won't cause problems.  It also centralizes the code
which reads the string.

Signed-off-by: Brad Larson <brad.larson@garmin.com>

Change-Id: I00dfe7c2b09739ed4c8ed07c6167e409b0bf7d13
2010-05-07 11:35:15 -07:00
Dirk Dougherty
0dd3a23951 Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 2010-05-07 10:57:48 -07:00
Brian Carlstrom
1db4264c30 am a0a126a0: am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl 2010-05-07 10:26:46 -07:00
Brian Carlstrom
a0a126a060 am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken

* commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:25:41 -07:00
Brian Carlstrom
e34d31e690 am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp

* commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:23:34 -07:00
Brian Carlstrom
e616553ebc Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Part of fixing b/2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace

Change-Id: Ic6070ab9abb58c08eb7c5d8648424f582bb48e1c
2010-05-07 10:13:36 -07:00
Joe Malin
18457d0c21 Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Change-Id: If43ba08af00c8c9fcf6d05834f8b2a7a719b4bec
2010-05-07 10:06:53 -07:00
Dan Egnor
43fe81bc2c Add unit test for passing thread priority & cgroup through Binder.
This test actually exposes some bugs -- the test passes as written, but
certain parts are commented out with references to the bugs in question.

Bug: 2665914
Bug: 2665954
Change-Id: I61220e0efadc4edbb6ad419d26fa1f0f50bbc24c
2010-05-07 09:32:54 -07:00
Joe Malin
5725323747 am 4405a0fe: am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample. 2010-05-07 09:00:20 -07:00
Joe Malin
4405a0fefb am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken

* commit '9609cdc8522414b61ffb7d31b4ceb2007f205129':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:58:42 -07:00
Joe Malin
9609cdc852 am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Merge commit 'e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp

* commit 'e50b940f153070a631a6c0d426cb7f3207042659':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:54:53 -07:00
Joe Malin
e50b940f15 Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Change-Id: Id2525470127a6324c361d952f09afec7dd584704
2010-05-07 08:37:23 -07:00
Bjorn Bringert
c688d336df am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:45:24 -07:00
Bjorn Bringert
74612539d2 am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken

* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
c8170ee205 am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
75370e7462 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00
Mathias Agopian
2df6f51567 fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).

in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.

Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
2010-05-06 20:21:45 -07:00