16894 Commits

Author SHA1 Message Date
Andreas Huber
89e91f7696 Quick and dirty implementation to follow http redirects in stagefright. 2010-01-05 13:39:04 -08:00
Marco Nelissen
592632562a Unhide some MediaStore things that should be public. 2010-01-05 12:56:04 -08:00
Scott Main
3979a60a94 am 95eeedfe: am c20467f9: docs: update the device dashboard
Merge commit '95eeedfe8dc24db7a981ef69f94d307548d020fa'

* commit '95eeedfe8dc24db7a981ef69f94d307548d020fa':
  docs: update the device dashboard
2010-01-05 12:34:14 -08:00
Scott Main
95eeedfe8d am c20467f9: docs: update the device dashboard
Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp

* commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
  docs: update the device dashboard
2010-01-05 12:31:06 -08:00
Jean-Baptiste Queru
554430d5b3 Merge "explicit set an "optional" tag" 2010-01-05 12:06:43 -08:00
Wink Saville
081b7d7ba2 Merge "Fix data connection support on emulator." 2010-01-05 11:47:44 -08:00
Jean-Baptiste Queru
ca328e70ed explicit set an "optional" tag 2010-01-05 11:40:22 -08:00
Grace Kloba
5aded76004 am 552346a7: am 106f9b24: Patch from Huahui Wu.
Merge commit '552346a743be7c8b10893f817238e92938866999'

* commit '552346a743be7c8b10893f817238e92938866999':
  Patch from Huahui Wu.
2010-01-05 11:32:52 -08:00
Andreas Huber
364b42170d Merge "Protect against possible temporary objects going away before we get at their data." 2010-01-05 11:28:58 -08:00
Grace Kloba
552346a743 am 106f9b24: Patch from Huahui Wu.
Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp

* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
  Patch from Huahui Wu.
2010-01-05 11:20:18 -08:00
Andreas Huber
dd0359f7a2 Protect against possible temporary objects going away before we get at their data. 2010-01-05 11:13:08 -08:00
Andreas Huber
6b39ab4c52 Merge "I must have broken raw-audio decoding in the recent past, this fixes it." 2010-01-05 11:08:21 -08:00
Andreas Huber
c79827a76f I must have broken raw-audio decoding in the recent past, this fixes it.
related-to-bug: http://b/issue?id=2352199
2010-01-05 10:54:55 -08:00
Grace Kloba
106f9b2446 Patch from Huahui Wu.
Fix http://b/issue?id=1908085
2010-01-05 10:50:39 -08:00
Scott Main
c20467f94a docs: update the device dashboard 2010-01-05 10:46:44 -08:00
Andreas Huber
67aee053ba Use stagefright for http streaming if the right property is set. 2010-01-05 09:27:02 -08:00
Cary Clark
57d2c3ad19 extract selected text from the picture
This deletes the messages between WebView and WebViewCore
that pass a region and extracts the rendered text
and returns the selected text from WebView directly.

This requires companion changes in external/webkit,
which in turn is dependent on changes to external/skia.

Fixes http://b/2166748
2010-01-05 10:31:04 -05:00
Wink Saville
6aa8a21bb4 Fix data connection support on emulator.
Bug: 2353316
Change-Id: I34765c70fc6ef160956d400647565c577141c0bf
2010-01-04 21:54:25 -08:00
Daisuke Miyakawa
2f389aa3ac Merge "Fix test breakage in vCard exporter." 2010-01-04 20:51:08 -08:00
Daisuke Miyakawa
1301341f13 Fix test breakage in vCard exporter.
Due to the change Iae8dbac1, all tests for vCard exporeter has failed.
This change fixes the breakage by using a kind of dirty Dependency Injection.

Current test framework for vCard exporter strongly depends on the assumption that
ContentValues objects are able to be directly passed to objects which use
ContentResolver, while the change above disabled the feature by removing
queryEntities().

This change makes VCardComposer forcibly uses queryEntities() via Reflection.
I agree that this change is not so clean, but works fine for now.
2010-01-05 13:44:51 +09:00
Erik Pasternak
176735c703 Merge "b/2293263 Replaced busybit functionality with eventDay functionality." 2010-01-04 18:43:39 -08:00
Jason Sams
225ef52bd6 Merge "Add RS support for generic attribs as input to vertex programs." 2010-01-04 16:53:42 -08:00
Jason Sams
e17964e150 Add RS support for generic attribs as input to vertex programs. 2010-01-04 16:52:27 -08:00
Erik
3763464e8f b/2293263 Replaced busybit functionality with eventDay functionality.
Made changes to start stripping out busybits and replace them with checks only to see if an event eists on a given day.
This file ties into several other areas so not all busybits references were removed and those that were have been
commented out to make it easier to find errors.
2010-01-04 16:29:15 -08:00
Suchi Amalapurapu
d9328513da Turn off debug flag 2010-01-04 16:18:06 -08:00
Romain Guy
1dabb95d28 Merge "Ignore key events when the widget is disabled. Bug: #2353635." 2010-01-04 15:40:27 -08:00
Android Git Automerger
d5c19608c6 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-04 15:39:56 -08:00
Romain Guy
992cc4282e Ignore key events when the widget is disabled.
Bug: #2353635.
2010-01-04 15:39:40 -08:00
Marco Nelissen
7eca501433 Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
Marco Nelissen
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -08:00
Andreas Huber
1a08ad1cae Merge "Make metadata support through stagefright property dependent until it's ready." 2010-01-04 15:08:32 -08:00
Andreas Huber
c4273482e0 Merge "Fix mpeg4/h.263 software decoder." 2010-01-04 15:07:36 -08:00
Suchi Amalapurapu
40967d61fc Merge "Add four way directional rotation to WindowOrientationListener" 2010-01-04 15:07:14 -08:00
Suchi Amalapurapu
63104edbf0 Add four way directional rotation to WindowOrientationListener 2010-01-04 15:05:20 -08:00
Andreas Huber
0d7da000cb Merge "Fix avc software decoder to properly handle SEI nalType and access unit delimiter." 2010-01-04 15:04:08 -08:00
Andreas Huber
7782fdf5b7 Make metadata support through stagefright property dependent until it's ready. 2010-01-04 15:02:02 -08:00
Romain Guy
7d3cbfe2db Merge "Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap. This removes an optimization but the benefit is not worth the memory leak. Bug: #2353474." 2010-01-04 14:54:02 -08:00
Romain Guy
c8ca2a3a07 Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap.
This removes an optimization but the benefit is not worth the memory leak.
Bug: #2353474.
2010-01-04 14:52:38 -08:00
Andreas Huber
2039bd93ed Fix mpeg4/h.263 software decoder. 2010-01-04 14:51:49 -08:00
Andreas Huber
6be8b14e25 Fix avc software decoder to properly handle SEI nalType and access unit delimiter. 2010-01-04 14:51:01 -08:00
Romain Guy
4cb8b8ffdf Merge "Fix typo in ColorStateList documentation." 2010-01-04 14:46:28 -08:00
Romain Guy
79dc8ccddd Fix typo in ColorStateList documentation. 2010-01-04 14:45:49 -08:00
Romain Guy
1c2d1d0296 Merge "Do not start filtering if the first character is a space. Bug: #2347833." 2010-01-04 14:34:55 -08:00
Romain Guy
cf6c5720a7 Do not start filtering if the first character is a space.
Bug: #2347833.
2010-01-04 14:34:08 -08:00
Marco Nelissen
f9f4173c7d Merge "Add the UNKNOWN_STRING definition to MediaStore. It will be removed from MediaFile once I've updated the code that uses it." 2010-01-04 14:02:49 -08:00
Ying Wang
24c10062cd am 5c529a0c: am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '5c529a0cb587d0dfa38e5642e268ca56285a356f'

* commit '5c529a0cb587d0dfa38e5642e268ca56285a356f':
  Rename ro.monkey to monkey.running
2010-01-04 13:49:47 -08:00
Marco Nelissen
ed297a8417 Add the UNKNOWN_STRING definition to MediaStore. It will be removed
from MediaFile once I've updated the code that uses it.
2010-01-04 13:24:31 -08:00
Ying Wang
5c529a0cb5 am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp

* commit '08fa1428eed52083789dc3b366aea4873199bd37':
  Rename ro.monkey to monkey.running
2010-01-04 12:59:17 -08:00
Nicolas Roard
0804043689 am 081798f9: am 38863336: layers support
Merge commit '081798f91270adb2a68979e5f7867d2021b8eed3'

* commit '081798f91270adb2a68979e5f7867d2021b8eed3':
  layers support
2010-01-04 12:49:50 -08:00
Ying Wang
08fa1428ee Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
2010-01-04 11:56:24 -08:00