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
Eino-Ville Talvala
d9c2601afa
Add auto-white balance locking to the Camera API.
...
Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.
Hidden for now.
Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
2011-05-17 10:52:42 -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
Adam Powell
21f1d49f0e
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
b4eb3acee4
am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:45:26 -07:00
Adam Powell
a7f52d4665
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Adam Powell
79411726d5
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -07:00
Andreas Huber
92f51e247d
Merge "Disable yuv->yuv mode and external display support until various driver fixes are in."
2011-05-17 08:35:38 -07:00
Derek Sollenberger
43124d2214
Merge "Updates resulting from the Skia merge (revision 1327)"
2011-05-17 04:55:56 -07:00
Narayan Kamath
b956f37e37
Pass synthesis request params through to the TTS service.
...
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
2011-05-17 09:47:59 +01:00
Dianne Hackborn
9d31154d0b
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc
Add new command line option to change global screen size.
...
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Jamie Gennis
e69b2634d2
SurfaceFlinger: unfreeze windows for fixed size buffers.
...
This change makes SurfaceFlinger unfreeze a window if it ever gets a
buffer that is fixed-size. Normally the window would not be frozen if
its in fixed-size mode, but if the window was frozen before entering
fixed-size mode then it should be unfrozen.
Change-Id: I6bc822d4b02ae51fa8914c1f60f5d24b2002b38d
2011-05-16 16:59:04 -07:00
Christopher Tate
14a2935809
bu - add handling for both 'backup' and 'restore' modes
...
Requires a parallel change in adb to support the new syntax.
Change-Id: Iff30cb247e424b6817af121c018f3c4e40b9f81a
2011-05-16 16:57:32 -07:00
Jim Miller
4383243d00
Merge "Fix the build."
2011-05-16 16:40:13 -07:00
Jim Miller
3e4df313a6
Fix the build.
...
Change-Id: I884580f52ebc817cee736f6d1bafbc59bd6662cd
2011-05-16 16:38:06 -07:00
Wink Saville
a77f4c530b
am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '360f553311ab697995d24c2a42e45659a5436efa':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:35:10 -07:00
Wink Saville
360f553311
am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '7b0339a8adca1347fe7ac3ac118c903ff32442a8':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:31:56 -07:00
Xavier Ducrohet
05b7b69c6c
LayoutLib: support the new baseline/margin query API.
...
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
2011-05-16 16:29:03 -07:00
Wink Saville
7b0339a8ad
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
2011-05-16 16:28:59 -07:00
Andreas Huber
126a2cd686
Disable yuv->yuv mode and external display support until various driver fixes are in.
...
Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
2011-05-16 16:14:13 -07:00
Roman Nurik
0b171e4c3f
am 3eb81b63: am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '3eb81b6318f94b21a3559df57f25ff2f48fcb244':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:08:32 -07:00
Roman Nurik
3eb81b6318
am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '136fa20d08d3a25c49077fde076febf105452edc':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:06:27 -07:00
Cibu Johny
8666663e6e
View horizontalDirection public attribute resolution to an internal var.
...
Change-Id: Id87ab188faef27ff039cf6a400118707ee74a27d
2011-05-16 16:03:31 -07:00
Roman Nurik
136fa20d08
am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:03:31 -07:00
Roman Nurik
8f3dbe1c37
am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:01:27 -07:00
Roman Nurik
ce6253d8fd
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Kazuhiro Ondo
2121291186
No data icon switch seen between LTE to EHRPD Handover
...
Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
2011-05-16 15:54:45 -07:00
Wink Saville
cbdfd801ff
am 648831cc: am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '648831cc85f895e95ce65509f5e9e67ed4bf2926':
Fix data attempt while PS is not in-service
2011-05-16 15:53:57 -07:00
Wink Saville
648831cc85
am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
2011-05-16 15:51:02 -07:00
Wink Saville
99f04c4943
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
2011-05-16 15:47:42 -07:00
Chia-chi Yeh
917e916b1c
Merge "Add a new permission for user space VPN applications."
2011-05-16 15:30:45 -07:00