36816 Commits

Author SHA1 Message Date
Android Git Automerger
c3e1770ff3 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-11-19 11:10:11 -08:00
Brad Fitzpatrick
de8da848cd Merge "StrictMode: use Log.isLoggable" 2010-11-19 11:07:47 -08:00
Gilles Debunne
a944828d3b Merge "Clean-up in StaticLayout" 2010-11-19 11:07:15 -08:00
Gilles Debunne
6611147383 Clean-up in StaticLayout
Change-Id: I81ac5d8bef7ce8f4f65e3a8c7da8393ce0a87558
2010-11-19 11:04:37 -08:00
Mike Lockwood
76151f2505 Merge "PTP: Fix permissions problems with files imported via PTP" 2010-11-19 10:58:47 -08:00
Charles Chen
6e050f79f8 Merge "Removing logs of text that is being spoken." 2010-11-19 10:56:45 -08:00
Dirk Dougherty
fb77461234 am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
  Doc change: update media formats table.
2010-11-19 10:56:26 -08:00
Mike Lockwood
929b3da2fc PTP: Fix permissions problems with files imported via PTP
Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 13:55:22 -05:00
Dirk Dougherty
00f502a38c am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.
2010-11-19 10:53:20 -08:00
Charles Chen
a19ac0f639 Removing logs of text that is being spoken.
Change-Id: I12624e51eb093b6ee464fc11275046a9e5100925
2010-11-19 10:50:03 -08:00
James Dong
2747e0e07f Removed uncessary FILE structure pointer for I/O
o also move the fd owner from caller to callee in the Writers

Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
2010-11-19 10:48:22 -08:00
Dirk Dougherty
0e29064d1c Merge "Doc change: update media formats table." into gingerbread 2010-11-19 10:47:10 -08:00
Robert Greenwalt
44138f15ce Merge "Notify all VMs when proxy changes." 2010-11-19 10:34:17 -08:00
Andreas Huber
978ba93842 Merge "Fix an artifact of going from off_t to off64_t" 2010-11-19 10:31:50 -08:00
Brad Fitzpatrick
33710fc4a9 am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string."
* commit '096c4c448d8110c21108f2db4a19a85099e78557':
  Improve performance when getting styled string.
2010-11-19 10:27:56 -08:00
Jean-Baptiste Queru
95fcd9e486 am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:27:51 -08:00
Brad Fitzpatrick
096c4c448d am 251384a7: Merge "Improve performance when getting styled string."
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
  Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Jean-Baptiste Queru
f69f356eba am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:24:51 -08:00
Robert Greenwalt
434203a277 Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
2010-11-19 10:24:30 -08:00
Scott Main
44868fdbb0 Merge "docs: de-'new' samples and tutorials" 2010-11-19 10:23:29 -08:00
Mike Lockwood
ec99f45fc5 Merge "Remove command line mtp host tool" 2010-11-19 10:22:09 -08:00
Scott Main
183ecbc229 docs: de-'new' samples and tutorials
Change-Id: I49cbabcb1f3a915259588bc98b05a9d702f5eb2d
2010-11-19 10:20:45 -08:00
Irfan Sheriff
7c55c74f52 Merge "Split SupplicantStateTracker and refactor" 2010-11-19 10:18:29 -08:00
Andreas Huber
783f68398b Fix an artifact of going from off_t to off64_t
Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
2010-11-19 10:08:23 -08:00
Andreas Huber
5af53d4363 Merge "Squashed commit of the following:" 2010-11-19 10:07:28 -08:00
Andreas Huber
61c79b6df9 Squashed commit of the following:
commit 610ed879d57785cb0457f7f127889496d325f732
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:28:52 2010 -0800

    HTTP header keys are to be treated case insensitive.

    Change-Id: I9690880528a6b0f611958de7996c2753948a03c3

commit 554a2499a293d8d53907d01d972a9cfe9b92738e
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:22:45 2010 -0800

    Remove one more legacy "string" implementation.

    Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b

Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
2010-11-19 09:36:13 -08:00
Mike Lockwood
49fd5d9957 Remove command line mtp host tool
I don't need this any more, and don't have time to finish nor maintain it.

Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 12:24:03 -05:00
Kenny Root
9c950b41c5 Merge "Use different version of CLDR data in DatePicker" 2010-11-19 09:11:42 -08:00
Scott Main
92d735ac4f Merge "new docs for fragments" 2010-11-19 09:09:33 -08:00
Amith Yamasani
65340f1c41 Merge "Update screen timeout again." 2010-11-19 08:47:36 -08:00
Mike Lockwood
cc34eed58d Merge "PTP: Improve performance and reliability of file importing" 2010-11-19 08:33:21 -08:00
Mike Lockwood
954c267725 PTP: Improve performance and reliability of file importing
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 11:30:10 -05:00
Brad Fitzpatrick
251384a759 Merge "Improve performance when getting styled string." 2010-11-19 07:41:39 -08:00
Kristian Monsen
9803d7f870 Merge "Find mime from file extension if the mime is empty" 2010-11-19 06:58:01 -08:00
Kristian Monsen
9d005a1039 Find mime from file extension if the mime is empty
Fix for bug 3170039

Change-Id: I6d32ae157ec276575aad8fbcd73f02c48fe219d0
2010-11-19 14:53:44 +00:00
Henrik Hall
95bc625e29 Enabling cell broadcast (SMS-CB) support in the platform.
Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
2010-11-19 15:00:00 +01:00
Takeshi Aimi
dc91865622 Update of DRM Framework.
-Access permission handling
  Introduce an internal function which allows the desired process to
  access decryption flow. This new function is just for reference and
  each OEM manufacturer should implement/replace with their solutions.
-New API, getMetadata()
  This API is for retrieving media metadata from container-based DRM,
  such as OMA forward-lock content. This API asks DRM agent to retrieve
  media metadata hiddein inside of DRM special container.
-New API, acquireRights()
  This API wraps acquireDrmInfo() and processDrmInfo().
  If DRM agent has valid implementation of both APIs,
  Application can acquire DrmRights only by calling this API.
-Bug fix in event loop of OnInfoListener.
  Separate OnInfo event loop from mail thread loop so as to avoid
  the issue that message is not dispatched when mail thread is busy.

Changes are made by SEMC and Sony.

Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
2010-11-19 22:02:51 +09:00
Wu-cheng Li
99a3f3e4e0 Improve camera documentation.
bug:3212606
Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
2010-11-19 16:20:04 +08:00
Jesse Wilson
a8bbc11afc Merge "Decode JSON literal types eagerly and with our own decoder." 2010-11-18 23:09:44 -08:00
Jesse Wilson
9d9b4e70a1 Decode JSON literal types eagerly and with our own decoder.
Previously we relied on Double.parseDouble() to decode tokens. Since
that method is expensive, we deferred calling it unless absolutely
necessary.

Now we decode the literal type immediately. For efficiency we decode
the token right out of the char buffer. This makes things more
complicated but it saves many calls to charAt().

With this change overall performance is 7% faster for JSON documents
cited in the bug.

    benchmark                     run  ms linear runtime                    %
GsonParseFull no switch, no int parse 309 ============================    93%
GsonParseFull                baseline 330 ============================== 100%

http://b/3201883
Change-Id: I436b6769956b1357a17c807a327d3a234691c73f
2010-11-18 23:06:50 -08:00
Xavier Ducrohet
55acd60be3 Layoutlib: support viewkey in include nodes.
When an include tag is parsed, the custom bridge
code never has access to both parsers at the same
time.
The child parser is created out of an in (representing
the layout id), and the code inflating the content of
the include layout doesn't see the parent parser either.

This changeset adds a parser stack in the BridgeContext
in order to allow access to the parent parser when setting
the viewkey. This is only used if the current parser depth
is 1 (top node), as we only want to set the include
node to the top node of the included layout.

Change-Id: I2ac3b72a0c84a269d9019f44f98cbc0b615ab959
2010-11-18 22:17:14 -08:00
Xavier Ducrohet
60899fac2b Merge "Layoutlib: use int[] wrapper to use as map keys." 2010-11-18 21:00:59 -08:00
Dianne Hackborn
f532eec860 Merge "Some work on issue #3201795: Improve transition when keyboard comes up" 2010-11-18 20:05:19 -08:00
Xavier Ducrohet
1fba35011d Merge "Layoutlib: Properly dispose of bitmap delegate." 2010-11-18 20:03:31 -08:00
Dianne Hackborn
8e11ef0d94 Some work on issue #3201795: Improve transition when keyboard comes up
Now try to slide dialogs if they end up moving due to the IME (or
other system things) showing/hiding.  Pretty hackish, but seems to
work.

Change-Id: Icd297e941cf847fa920c9605145c46be63043d52
2010-11-18 19:57:49 -08:00
Xavier Ducrohet
755b46d597 Layoutlib: use int[] wrapper to use as map keys.
This fixes the SlidingDrawer that failed to load.

For some reason, in case of the SlidingDrawer, when the constructor
uses android.R.styleable.SlidingDrawer it's the same values but not
the same instance as the array read from android.R through reflection.

So what works for all other widgets, and has worked since the very first
layoutlib isn't working anymore, and we'll now have to use a wrapper
similarly to what we use in ADT in the project callback.

We should probably provide a single int[] wrapper class in layoutlib
API for all to use.

Change-Id: I4d7d038540f8a24541a588696f1059a020b589e5
2010-11-18 19:51:30 -08:00
Dirk Dougherty
9f7580d8d1 doc change: Docs for SDK Tools r8, ADT 8
Change-Id: I4af977d17d1a505dde2fbc9102abad4e2a0e52b1
2010-11-18 19:40:51 -08:00
Hiroshi Takekawa
dc1a26eb78 StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file.  This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
2010-11-19 12:14:37 +09:00
Xavier Ducrohet
5a09488a15 Layoutlib: Properly dispose of bitmap delegate.
This is done by initializing the android.util.Finalizers that's
reponsible for calling out to the native bitmap destructor.
Also implemented the native bitmap destructor

Also fix Bridge by removing obsolete API methods, and removing
some unneeded synchronized blocks now that the whole rendering
(and scene creation) is protected by a synchronized on the bridge
object anyway.

Change-Id: Ie1792da6db354836542dfc11f457fe4a6d78ddfb
2010-11-18 18:26:55 -08:00
Brad Fitzpatrick
82829ef3b7 StrictMode: use Log.isLoggable
Change-Id: Ic28450066a43a168cfe3026d6d4b06b752f8423c
2010-11-18 18:25:29 -08:00