Commit Graph

14627 Commits

Author SHA1 Message Date
Robert Greenwalt
49503107e9 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Scott Main
4f3fbc22bb am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp

* commit '62c28caee4a26e106134264f917bacef77438483':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
2010-05-10 09:56:43 -07:00
Scott Main
3bd882a0e2 Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 2010-05-10 09:54:30 -07:00
Dan Egnor
ee9d1a7af4 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
d4f55816a5 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
60cc15de8e 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
ec057d4663 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
6061012600 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
e7c4447296 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
f79e4c7fd5 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
02e9bff357 Merge "long modifier was on the wrong argument." 2010-05-10 08:55:17 -07:00
Dan Egnor
cd836255bf Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-09 07:03:46 -07:00
Dirk Dougherty
2f2c2bb2fe Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-07 21:07:57 -07:00
Andreas Huber
a10b8ac9f8 Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-07 13:47:42 -07:00
Mathias Agopian
026fba3698 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
66308738bc Merge "Added WEB_URL_PATTERN for Montenegro ".me"" 2010-05-07 12:57:02 -07:00
Dirk Dougherty
37c990e9e2 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
bd08c07d9d 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
Joe Malin
bb52cb2555 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
Bjorn Bringert
453193cf4a 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
cea4d290c0 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00
Mathias Agopian
179169e88e 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
Dan Egnor
e3c233d1a9 am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp

* commit '8a8658a5de261c2da72d431940877bd054bc9837':
  Make static versions of libutils and libbinder.
2010-05-06 17:33:45 -07:00
Dan Egnor
359b3fd8d8 Merge "Make static versions of libutils and libbinder." into froyo 2010-05-06 17:31:48 -07:00
Daniel Sandler
1a5b93a2d9 am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:24:22 -07:00
Daniel Sandler
e854180f4f Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 2010-05-06 17:23:03 -07:00
Robert Greenwalt
66686441cd am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00
Robert Greenwalt
3bc8dc86a1 Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:14:23 -07:00
Xia Wang
363809c71d am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp

* commit '11505b474b16457fb65952aadba0609cb33de8e7':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:12:38 -07:00
Dan Morrill
126a6eab49 am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp

* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
  Adding PacketVideo attribution in NOTICE.
2010-05-06 16:12:33 -07:00
Neal Nguyen
649f6f64b4 am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp

* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
  Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:12:22 -07:00
Xia Wang
a62ab7c22a Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 15:24:08 -07:00
The Android Open Source Project
3877d301aa merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Dan Morrill
2e55d964ca Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 15:11:02 -07:00
Dan Morrill
869aba8aaf Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
Neal Nguyen
ad8507cfdc Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 13:45:18 -07:00
Andreas Huber
aeb4f0751f am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp

* commit '100ef9bee48c9beb83d885d233de6a42c64f55af':
  Disable vorbis seek when streaming from localhost.
2010-05-06 12:36:13 -07:00
Dirk Dougherty
b9575af85c am 5305627d: Doc change: New doc that describes how market filters work
Merge commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp

* commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
  Doc change: New doc that describes how market filters work
2010-05-06 12:36:10 -07:00
Dan Bornstein
afa867debe am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp

* commit '42ee86e66d972dcdf240e549e5fdc151a144af64':
  For issue #2651381, allow library prelinking.
2010-05-06 12:36:05 -07:00
Neal Nguyen
7cc7372cb9 am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp

* commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
  Adding a few host-based stress tests for Apps on SD.
2010-05-06 12:36:01 -07:00
Andreas Huber
2da054cbe4 Merge "Disable vorbis seek when streaming from localhost." into froyo 2010-05-06 11:27:35 -07:00
Dan Bornstein
64e6c7296e Merge "For issue #2651381, allow library prelinking." into froyo 2010-05-06 10:01:39 -07:00
Neal Nguyen
5c9d242fe4 Merge "Adding a few host-based stress tests for Apps on SD." into froyo 2010-05-06 09:44:10 -07:00
Mike Lockwood
06979ad3df Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent" 2010-05-06 07:50:13 -07:00
Dan Egnor
386a332b4f Make static versions of libutils and libbinder.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so.  The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.

Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
2010-05-06 01:03:31 -07:00
Suchi Amalapurapu
5b1932c2ce am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp

* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:50:34 -07:00
Dan Bornstein
09667f43c1 am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp

* commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2':
  For issue #2651381, allow library prelinking.
2010-05-05 17:50:28 -07:00
Suchi Amalapurapu
110ecf0542 Merge "Fix 2656989. Clean up update to updated system applications." into froyo 2010-05-05 17:38:58 -07:00
Jean-Baptiste Queru
afeaca2513 Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones" 2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
d40eb168d1 Merge "Type Zero Sms should not be displayed/stored/notified." 2010-05-05 16:18:30 -07:00