50486 Commits

Author SHA1 Message Date
Andreas Huber
0920bca3ab Properly forward rotation information from input format to output format.
The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.

Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
2011-05-18 09:31:22 -07:00
Mike Lockwood
b6aabcf6e3 resolved conflicts for merge of 22c140b7 to master
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
2011-05-18 09:25:49 -04:00
Wink Saville
748caa8a7e Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport" 2011-05-17 23:32:01 -07:00
James Dong
f84e4a657f Revert "Add const to the finders method in MetaData.cpp"
This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

	include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
2011-05-17 22:39:06 -07:00
JP Abgrall
cb4d1a91fc dumpstate: don't attempt to use vril-dump, it breaks adb bugreport
http://b/4442803 vril-dump's usage of adb causes bugreport to hang

lcm-dump.sh re-uses adb which breaks.

Change-Id: I5eeb30f78793c0a6d10bfaf0097d6aa7b811cf66
Signed-off-by: JP Abgrall <jpa@google.com>
2011-05-17 21:35:54 -07:00
Eric Fischer
52ee3eb4eb Merge "Import revised translations." 2011-05-17 17:14:56 -07:00
Eric Fischer
89234127e5 Import revised translations.
Change-Id: I8c101b5eaee4ed13f3b36f25ea90aa9c940c45d5
2011-05-17 16:51:41 -07:00
Brian Carlstrom
d752472d9a Move to KeyChain.bind
Change-Id: Ic3c6e0e9be9bcfdc882cf97cec38cca70b23d0a1
2011-05-17 16:20:36 -07:00
Alex Sakhartchouk
51c07e717b Merge "Moves fbo support in renderscript behind the hal" 2011-05-17 15:40:29 -07:00
Jamie Gennis
433060a152 Merge "SurfaceFlinger: unfreeze windows for fixed size buffers." 2011-05-17 15:13:35 -07:00
Jaikumar Ganesh
71f017e0b0 Merge "Improve locking granularity for PAN and Input." 2011-05-17 15:12:00 -07:00
Jaikumar Ganesh
6003fe9af0 Improve locking granularity for PAN and Input.
Long term, all this needs to be converted to a state machine.

Change-Id: I757a04994cd04e490a632b433e62b00a23880638
2011-05-17 15:10:00 -07:00
Romain Guy
0a2ed6de7b Merge "Improve LayoutInflater's compliance." 2011-05-17 15:06:09 -07:00
Jason Sams
3badb0d0ca Merge "Core to client fifo on sockets." 2011-05-17 15:05:50 -07:00
Jason Sams
edbfabdb98 Core to client fifo on sockets.
Change-Id: I3b84a7d4c3c5fa0d764ad4db22dfd142d5cfa95b
2011-05-17 15:01:29 -07:00
Brian Carlstrom
eb00a7e43f Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)" 2011-05-17 14:57:31 -07:00
Romain Guy
9c1223a713 Improve LayoutInflater's compliance.
There are standards, we should do our best to implement them
properly.

Change-Id: I83a7dc0651795d09b19d536c17b6aefc2eca5c81
2011-05-17 14:25:49 -07:00
Fabrice Di Meglio
dff7897548 Merge "View horizontalDirection public attribute resolution to an internal var." 2011-05-17 14:16:43 -07:00
Chet Haase
63e2c0888d Merge "Fix for using HARDWARE layers on unaccelerated views." 2011-05-17 14:00:53 -07:00
Adam Powell
36aad417a3 Merge "resolved conflicts for merge of 2b6ace58 to master" 2011-05-17 13:57:07 -07:00
James Dong
384fa845fb Merge "Make track informational event optional, depending on system property" 2011-05-17 13:41:42 -07:00
Adam Powell
5d4034a37e resolved conflicts for merge of 2b6ace58 to master
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
2011-05-17 13:41:24 -07:00
Mike Lockwood
22c140b7b9 am 798df16e: am 50b27631: Remove some cruft that was left in config.xml by mistake
* commit '798df16e3a3920ba55d7abc7ed10def6a17132bf':
  Remove some cruft that was left in config.xml by mistake
2011-05-17 13:14:32 -07:00
Mike Lockwood
798df16e3a am 50b27631: Remove some cruft that was left in config.xml by mistake
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
  Remove some cruft that was left in config.xml by mistake
2011-05-17 13:12:32 -07:00
Mike Lockwood
50b2763159 Remove some cruft that was left in config.xml by mistake
This should fix build breakage for products with nosdcard set.

Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 16:08:22 -04:00
Chet Haase
6f33e81a0b Fix for using HARDWARE layers on unaccelerated views.
If a view is not accelerated but has its layer type set to
LAYER_TYPE_HARDWARE, then the framework will use the old drawing cache
approach, to cache it in a bitmap. This works fine, but when the layer
is set to NONE, that drawing cache is not destroyed, as it would be were
the layer set to LAYER_TYPE_SOFTWARE. This prevents future invalidations on
the view from working correctly because the bitmap cache has never been
destroyed and recreated.

The fix is to always destroy the drawing cache when the layer type is
changed from SOFTWARE or HARDWARE, to make sure that it gets set appropriately
regardless of the state of the view's acceleration.

Change-Id: I449649e6d370477825015505da76564455a156e6
2011-05-17 12:42:19 -07:00
Jeff Sharkey
78ae81efa9 Merge "First pass at NetworkPolicy and activity tracking." 2011-05-17 12:27:01 -07:00
James Dong
0f32fb3ecf Make track informational event optional, depending on system property
o also add a track informational event to return the encoded data in kilo-bytes

Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
2011-05-17 12:21:57 -07:00
Adam Powell
2b6ace5811 am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
  Prevent cases of bogus action bar measurement.
2011-05-17 12:21:22 -07:00
Adam Powell
bd32a79ecb am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
  Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
f721b398ad Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2 2011-05-17 12:16:29 -07:00
Adam Powell
1b4a1628f3 Prevent cases of bogus action bar measurement.
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00
Scott Main
38442b6884 am 092aac23: am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
* commit '092aac23cef95ca4372a815210ff448b9c919aa4':
  docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:55:13 -07:00
Scott Main
092aac23ce am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
* commit '8a769dd1e3a328860c541faf56a6e676bf1dc01c':
  docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:50:51 -07:00
Brian Carlstrom
8e9929c4d0 Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)
frameworks/base

   Remove getCaCertificates and findIssuer from IKeyChainService,
   these are now done via libcore's TrustedCertificateStore (as part
   of the default TrustManager implementation)

	keystore/java/android/security/IKeyChainService.aidl

   Simplify KeyChain API. Now that the CA certificates are visible
   through the default TrustManager, the KeyChain is solely focused on
   retrieving PrivateKeys and their associated certificates. The
   calling API for KeyChain to simply a single KeyChain.get() call
   that returns a KeyChainResult, removing the need for a KeyChain
   instance that needs to be closed.

	keystore/java/android/security/KeyChain.java
	keystore/java/android/security/KeyChainResult.java

master/libcore

    Remove getDefaultIndexedPKIXParameters and
    getIndexedPKIXParameters which was used as part of the prototype
    of looking up CAs via the KeyChain but is obsoleted by the new
    default TrustManager implementation.

	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

packages/apps/KeyChain

    Tracking simplified IKeyChainService, removing now unneeded
    implementation, updating tests.

	src/com/android/keychain/KeyChainService.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java
	tests/src/com/android/keychain/tests/KeyChainTestActivity.java

Change-Id: I847b28c2f467c85f24d2b693a2fecc1cb46426b4
2011-05-17 11:33:37 -07:00
Scott Main
8a769dd1e3 am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
* commit 'a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
  docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:22:49 -07:00
Scott Main
a0ecd648ab am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
  docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Dianne Hackborn
0305e354e1 This API change is now part of MR2.
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
2011-05-17 10:49:53 -07:00
Scott Main
dcf2f35496 docs: simple update to OpenGl doc to update version support
Note, this doc still needs a lot more work; this is a small step
bug: 4395265

Change-Id: Ibe3fd816e88aa2b20ca99859b929164715f67027
2011-05-17 10:40:40 -07:00
Brian Carlstrom
7f2250d59a Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (1 of 6)" 2011-05-17 10:37:44 -07:00
Andreas Huber
6b75e412b3 am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:37:25 -07:00
Andreas Huber
c9eb18bb72 am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:34:41 -07:00
Andreas Huber
bf81d4be05 am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
c56e81c887 Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 2011-05-17 10:29:36 -07:00
Andreas Huber
021253406c Merge "Claim support for .3gpp2 A/B files." 2011-05-17 10:27:09 -07:00
Andreas Huber
708d908668 Claim support for .3gpp2 A/B files.
Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug: 4406745
2011-05-17 10:12:34 -07:00
Adam Powell
572c6037c4 am 143c529f: (-s ours) am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '143c529f28bd49e077e4bc36ff30ed2ff7ffb838':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 10:07:40 -07:00
Adam Powell
f95e474796 am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 10:07:23 -07:00
Adam Powell
143c529f28 am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
  DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:55:53 -07:00
Adam Powell
b45b21d13e am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit 'b4eb3acee4504ea35a43bef9dc6220560b55d2d2':
  Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:55:32 -07:00