53613 Commits

Author SHA1 Message Date
Brian Carlstrom
6da0033447 Moving ssl_certificate layout, resources, and helper code to SslCertificate
Add IKeyChainService.deleteCaCertificate

Change-Id: If42341bc732efcfe4f958c00cdd6c0fec11a3c75
2011-06-27 12:14:25 -07:00
Wu-cheng Li
a084c841aa Merge "Add framework support for camcorder zoom." 2011-06-27 02:29:21 -07:00
repo sync
1aceda35cc Support Invite w/ Replaces request.
bug:3326870
Change-Id: Idbfbe7e3cc6ba83874d42bfb7d149866f454e70a
2011-06-27 16:20:28 +08:00
Wu-cheng Li
42419ce28a Add framework support for camcorder zoom.
The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
  startRecording()
  stopRecording()
  releaseRecordingFrame()

ICameraRecordingProxyListener
  dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
   (1) The app: MediaRecorder.start().
   (2) The recorder: ICamera.unlock() and ICamera.disconnect().
   (3) The recorder: ICameraRecordingProxy.startRecording().
   (4) The app: ICamera.reconnect().
   (5) The app: ICamera.startRecording().
4. During recording
   (1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
   (2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
   (1) The app: MediaRecorder.stop()
   (2) The recorder: ICameraRecordingProxy.stopRecording().
   (3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
2011-06-27 15:44:57 +08:00
Chia-chi Yeh
14f14863c5 KeyStore: allow system user to get secrets from keystore.
Change-Id: I9cb41344c17fb33e6614a45d46368a9c43e3dce7
2011-06-26 18:24:19 -07:00
Brian Carlstrom
c18e7e7315 Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)" 2011-06-26 15:30:37 -07:00
Jamie Gennis
436b50f0dc Merge "SurfaceTexture: detach from Dalvik when necessary." 2011-06-26 12:23:12 -07:00
Brian Carlstrom
67c30dfe8e Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)
frameworks/base

    Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply
    preferred choice to be selected in chooser. This allows Email
    settings to highlight the current choice when allowing user to
    change settings.
	keystore/java/android/security/KeyChain.java
	api/current.txt

    Implemented KeyChain functionality to pass host and port
    information to KeyChainActivity for display.
	keystore/java/android/security/KeyChain.java

    KeyChain now sends a PendingIntent as part of the Intent it sends
    to the KeyChainActivity which can be used to identify the caller
    in reliable way.
	keystore/java/android/security/KeyChain.java

    Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse.
    Added Credentials.install variant with no value for use from KeyChainActivity
	keystore/java/android/security/Credentials.java

packages/apps/CertInstaller
    Source of extension constants now in Credentials
	src/com/android/certinstaller/CertFile.java

packages/apps/Browser
    Have browser supply host and port information to KeyChain.choosePrivateKeyAlias
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/browser/Tab.java

packages/apps/Email
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/email/view/CertificateSelector.java

packages/apps/KeyChain

    KeyChain now depends on bouncycastle X509Name for formatting
    X500Principals, since the 4 X500Principal formatting options could
    not format emailAddress attributes in a human readable way and its
    the most important attribute to display for client certificates in
    most cases.
	Android.mk

    Changing the UI to a dialog, make the activity style transparent.
	AndroidManifest.xml
	res/values/styles.xml

    Layout for chooser dialog
	res/layout/cert_chooser.xml

    Layout for list items in chooser
	res/layout/cert_item.xml

    New resources for dialog including comments for translators.
	res/values/strings.xml

    New dialog based KeyChainActivity. Now also shows requesting app
    and requesting server. Now can preselect a specified alias. New
    link directly to CertInstaller.

	src/com/android/keychain/KeyChainActivity.java

    Fix KeyChainTestActivity to work with TestKeyStore changes that
    were causing network activity on the UI to look up the name of
    localhost. Also track KeyChain.choosePrivateKeyAlias API change.

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

Change-Id: I07128fba8750f9a6bcb9c6be5da04df992403d69
2011-06-25 16:48:25 -07:00
Irfan Sheriff
dde052f4ba Merge "WifiWatchdogService - disable bad connections" 2011-06-25 11:20:54 -07:00
Jeff Sharkey
f670be372b Merge "Finish any enter animation when jumping to state." 2011-06-24 23:12:38 -07:00
Adam Powell
681873fcc9 Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views" 2011-06-24 19:17:38 -07:00
Fabrice Di Meglio
8ed2acd838 Merge "Introduce MarginLayoutParams marginStart and margingEnd" 2011-06-24 19:00:30 -07:00
Fabrice Di Meglio
b76023afd1 Introduce MarginLayoutParams marginStart and margingEnd
- update BiDiTest app for adding more unit tests concerning margin

Change-Id: Ia6a7e0a1948a2c375e8f3cc87d120a85351a8c27
2011-06-24 18:55:24 -07:00
Romain Guy
f7afae5cc8 Merge "Update GLTextureView sample to do something real." 2011-06-24 18:52:47 -07:00
Romain Guy
d0d0705994 Update GLTextureView sample to do something real.
Change-Id: I55a62434ae0b602522221689626f6b4155bd0d91
2011-06-24 18:51:28 -07:00
Jim Miller
f782ded942 Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView." 2011-06-24 18:44:08 -07:00
Romain Guy
44f8d6bd15 Merge "Don't set texture parameters on every frame." 2011-06-24 17:54:25 -07:00
Romain Guy
4a5a71518a Don't set texture parameters on every frame.
Change-Id: Iec368405ad6a4ccfd569a0b3b4d681871a770396
2011-06-24 17:53:53 -07:00
Jim Miller
7377cd0ab4 LockScreen layout, button style, and owner info fixes
- enable OwnerInfo to appear in status1 if dedicated view not present.
- force all status lines to be singleline and marquee.
- fix justification in landscape layouts.
- use buttonBarStyle for buttons on all LockScreens.
- reduce the size of the clock to fit in landscape.
- no longer show "Draw a pattern to unlock" help message in LockPatternView.

Change-Id: I1ff51550e2180f9d912c8f710ad5e2fd2424d373
2011-06-24 17:45:34 -07:00
Romain Guy
4c60c541de Merge "Properly tear down TextureView" 2011-06-24 17:21:26 -07:00
Romain Guy
80429c4585 Properly tear down TextureView
Change-Id: Ic23cd9257889d0abe8cc3fc1d04a66d0505e383e
2011-06-24 17:20:32 -07:00
Adam Powell
6556c074ee Fix bug 4903822 - vertical gravity bugs in action bar custom views
Change-Id: I20a319bf8fd5b5acf823a2651639f94d6efac5e4
2011-06-24 17:17:58 -07:00
Scott Main
01ecdcc756 am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
  docs: add Lenevo driver info
2011-06-24 17:15:53 -07:00
Jeff Sharkey
a0ac98bd5c Finish any enter animation when jumping to state.
When jumpDrawablesToCurrentState(), finish any alpha animation in
progress.  Fixes bug where drawable with enter fade would remain
transparent until next state change.

Change-Id: Ia087f935566a8d78e0efdcb0a1a2f791db05c70e
2011-06-24 17:08:12 -07:00
Tsu Chiang Chuang
b40ec927bb Merge "adding notification stress tests." 2011-06-24 16:55:36 -07:00
Robert Greenwalt
554475f09c Merge "resolved conflicts for merge of 40717996 to master" 2011-06-24 16:39:08 -07:00
Tsu Chiang Chuang
a760e55783 adding notification stress tests.
Change-Id: Ideaae33843685fcbec4c4f38bf9c2ced97c9bf86
2011-06-24 16:19:37 -07:00
Robert Greenwalt
86994c1fc1 resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
2011-06-24 16:10:06 -07:00
Isaac Levy
bc7dfb58bf WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
2011-06-24 15:48:10 -07:00
Dianne Hackborn
7cec14235d Merge "Small cleanup of am/pm commands." 2011-06-24 15:22:22 -07:00
Christopher Tate
78a7f12043 Merge "Fix settings restore" 2011-06-24 15:15:51 -07:00
Christopher Tate
28cdb9e104 Fix settings restore
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
2011-06-24 15:06:48 -07:00
Romain Guy
c1ba416af5 Merge "Reduce the number of UI events required to update a SurfaceTexture." 2011-06-24 14:56:20 -07:00
Romain Guy
58f4edb770 Reduce the number of UI events required to update a SurfaceTexture.
Change-Id: I9330c9646654fff57dcd6817c86e587a6490a9ad
2011-06-24 14:55:55 -07:00
Jesse Wilson
9bc0521e2b Merge "Test that algorithm name is case-insensitive for digest auth." 2011-06-24 14:33:46 -07:00
Jesse Wilson
df867f8f80 Test that algorithm name is case-insensitive for digest auth.
Change-Id: I891a533ae3b16b838925fa488093c19dfeb32efa
http://code.google.com/p/android/issues/detail?id=16051
2011-06-24 13:50:37 -07:00
Dianne Hackborn
46d110329e Small cleanup of am/pm commands.
Change-Id: I5af730bc177635821a82d4dd3ec9130a5dcd525a
2011-06-24 13:22:45 -07:00
Romain Guy
c897fbfaf9 Merge "Code cleanup" 2011-06-24 13:21:30 -07:00
Romain Guy
02ccac69fd Code cleanup
Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
2011-06-24 13:20:23 -07:00
Daisuke Miyakawa
b81b1c91d8 Merge "Uppercase region code so that AsYouTypeFormatter works correctly." 2011-06-24 12:32:04 -07:00
Fabrice Di Meglio
a54a600bc4 Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes" 2011-06-24 12:21:28 -07:00
Fabrice Di Meglio
d3d4b4b86a Merge "Fix potential advances overrun in TextLayoutCache." 2011-06-24 12:02:58 -07:00
Doug Felt
b092f55c37 Fix potential advances overrun in TextLayoutCache.
Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
2011-06-24 11:54:00 -07:00
John Reck
f4db8d566c Merge "Don't resend WEBKIT_DRAW if paused" 2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
c9286ebbf4 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Jaikumar Ganesh
2ea1e85dcb Implement APIs for Bluetooth Health profile.
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
2011-06-24 11:31:43 -07:00
John Reck
1c1e6df04a Don't resend WEBKIT_DRAW if paused
Bug: 4606210
 If a WEBKIT_DRAW message came in after the WebView was paused,
 it would fail to draw causing it to re-send the WEBKIT_DRAW message
 which would lead to an infinite loop until the WebView is resumed.
 Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.

Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
2011-06-24 11:07:09 -07:00
Amith Yamasani
b0b1b11b96 Merge "SearchView improvements per design." 2011-06-24 10:58:38 -07:00
Jaikumar Ganesh
e0ac113b47 Merge "Fix excessive locking synchronization leading to deadlocks." 2011-06-24 09:28:02 -07:00
The Android Open Source Project
a6bdb4c771 Reconcile with gingerbread-release
Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
2011-06-24 08:08:41 -07:00