summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "KeyStore: fix test-keystore"Chia-chi Yeh2011-06-271-4/+5
|\
| * KeyStore: fix test-keystoreChia-chi Yeh2011-06-271-4/+5
| | | | | | | | Change-Id: I1dcbd5c3cc7569c397d2480cda76288a9e28cd5c
* | Merge changes I0077e5e5,I42cbed69Mike J. Chen2011-06-276-21/+84
|\ \ | | | | | | | | | | | | | | | * changes: Hookup interface status to other clients Revert "Revert "Propagate new link-status-change message to any NetworkManagementService""
| * | Hookup interface status to other clientsMike J. Chen2011-06-246-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After unreverting the linkstate change patch, hook up notification handlers that didn't exist when the first patch was created, like EthernetDataTracker.java and Vpn.java. For the observers that handle interfaceStatusChanged(), I made interfaceLinkStatusChanged() call it so they both do the same thing. Change-Id: I0077e5e5f48f3932ba98f5bf363243892f2de6cc Signed-off-by: Mike J. Chen <mjchen@google.com>
| * | Revert "Revert "Propagate new link-status-change message to any ↵Mike J. Chen2011-06-234-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkManagementService"" This reverts commit 1a7e67190228a8ff3b92e7e5496a8db8ff306cca. Bring back the changes from Stan Chesnutt regarding link-status-change notifications. The comment from the original patch was: Propagate new link-status-change message to any NetworkManagementService observers. Also fix the syntax of the "interface-status-change" message. Add a null handler in the ThrottleService and Tethering classes (plus fix names). Change-Id: I42cbed692024de32275cad234f42ff23ab7e9d8d Signed-off-by: Mike J. Chen <mjchen@google.com>
* | | Fixing the buildSvetoslav Ganov2011-06-272-3/+3
| | | | | | | | | | | | Change-Id: Ic3664e5cd812d5fe59c9cf2657a441ca76a61135
* | | Merge "AccessibilityInjectorTest did not restore the default key binsings."Svetoslav Ganov2011-06-271-3/+3
|\ \ \
| * | | AccessibilityInjectorTest did not restore the default key binsings.Svetoslav Ganov2011-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. AccessibilityInjectorTest changes the key bindings and when done restores the defatult ones. The restoreation was not working. bug:4905620 Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
* | | | Merge "ArrayIndexOutOfBounds exception in TouchExplorer."Svetoslav Ganov2011-06-271-13/+21
|\ \ \ \
| * | | | ArrayIndexOutOfBounds exception in TouchExplorer.Svetoslav Ganov2011-06-271-13/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The explorer was injecting up/down touch events to click with the id of the last pointer that went up but the prototype i.e. last touch explore event may not contain this pointer. Since we click on the last touch explored location then using the action pointer index of that event is the right approach. bug:4551506 Change-Id: I73428b09dc014417096a52e667f58768a2871dc8
* | | | Merge "Added scroll and text selection change accessibility events."Svetoslav Ganov2011-06-2713-104/+525
|\ \ \ \
| * | | | Added scroll and text selection change accessibility events.Svetoslav Ganov2011-06-2613-104/+525
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added scrolling accessibility event to provicde feedback when a view is scrolled. Note: We need scroll events for ICS since even though we have touch exploration the user does not know when something is scrollable and not feedback is provided while scrolling. bug:4902097 2. Added a text selection change event to provide feedback for selection changes including cursor movement. Note: We need the text selection change events for ICS since even though the IME supports navigation in text fields the user receives no feedback for the current selection/ cursor position. bug:4586186 3. Added a scrollable property to both AccessibilityEvent and AccessibilityNodeInfo. The info has to describe the source in terms of all properties that make sense for accessibility purposes and the event has this property (kinda duplicated) since clients will aways want to know if the source is scrollable to provided clue to the user and we want to avoid pulling the info of the source for every accessibility event. Change-Id: I232d6825da78e6a12d52125f51320217e6fadb11
* | | | Merge "Fixing various broken javadoc comments in framework."Romain Guy2011-06-272-3/+3
|\ \ \ \
| * | | | Fixing various broken javadoc comments in framework.Andrew Sapperstein2011-06-242-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I48a6b3c268e8ebf3aa2ff3a1de7ff5fa6f8f6de7
* | | | | Merge "Fix the new color converter to respect the destination crop rect."Andreas Huber2011-06-273-78/+83
|\ \ \ \ \
| * | | | | Fix the new color converter to respect the destination crop rect.Andreas Huber2011-06-273-78/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes the SoftwareRenderer to request blitting the correct crop rectangles. Change-Id: I38706cf9b42d96c6d5b35a9380f006ea4fbbf1ea
* | | | | | Merge "Log video dimensions and crop rectangle."Andreas Huber2011-06-271-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Log video dimensions and crop rectangle.Andreas Huber2011-06-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia56b09df4f6e9a14c4dcc499a6637fc39f8e3bb5
* | | | | | Merge "Update paths to test content used to run the omx_tests."Andreas Huber2011-06-271-11/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update paths to test content used to run the omx_tests.Andreas Huber2011-06-271-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
* | | | | | Merge "Reduce definition of monthly rep test"Andy McFadden2011-06-271-0/+17
|\ \ \ \ \ \
| * | | | | | Reduce definition of monthly rep testAndy McFadden2011-06-241-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repeatsMonthlyOnDayCount() function was returning true for events like FREQ=MONTHLY;BYDAY=TU which actually appear weekly. This is not the desired behavior of the function. Bug 4522027 Change-Id: I03ef68b429828097c8bad7fcd374e7c9eb4c7b03
* | | | | | | Merge "Turn on HW accel by default for apps that target ICS."Dianne Hackborn2011-06-273-4/+15
|\ \ \ \ \ \ \
| * | | | | | | Turn on HW accel by default for apps that target ICS.Dianne Hackborn2011-06-243-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I010e11e03b2dfd0d1db8c47f74c25a28586fd79c
* | | | | | | | Merge "Reduce the number of output buffers and force output buffers in ↵James Dong2011-06-272-2/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | display order for SoftAVC decoder"
| * | | | | | | Reduce the number of output buffers and force output buffers in display ↵James Dong2011-06-262-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order for SoftAVC decoder Change-Id: I9ec6d8205e7a56e42d5b5799a6c2e31076d24b81
* | | | | | | | Merge "Add framework support for camcorder zoom."Wu-cheng Li2011-06-2724-98/+604
|\ \ \ \ \ \ \ \
| * | | | | | | | Add framework support for camcorder zoom.Wu-cheng Li2011-06-2724-98/+604
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Support Invite w/ Replaces request.repo sync2011-06-277-15/+180
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:3326870 Change-Id: Idbfbe7e3cc6ba83874d42bfb7d149866f454e70a
* | | | | | | KeyStore: allow system user to get secrets from keystore.Chia-chi Yeh2011-06-261-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Change-Id: I9cb41344c17fb33e6614a45d46368a9c43e3dce7
* | | | | | Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 ↵Brian Carlstrom2011-06-263-10/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | of 5)"
| * | | | | | Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)Brian Carlstrom2011-06-253-10/+53
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "SurfaceTexture: detach from Dalvik when necessary."Jamie Gennis2011-06-261-10/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | SurfaceTexture: detach from Dalvik when necessary.Jamie Gennis2011-06-231-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a call to detach from the Davlik VM in SurfaceTexture JNI calls that caused an attach. Change-Id: I8e0d7d596680bd25ac42f8db4ca8343a62827255
* | | | | | Merge "WifiWatchdogService - disable bad connections"Irfan Sheriff2011-06-255-1243/+747
|\ \ \ \ \ \
| * | | | | | WifiWatchdogService - disable bad connectionsIsaac Levy2011-06-245-1243/+747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complete rewrite of WifiWatchdogService.java. Checking for connectivity and managing wifi upon failure detection. Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
* | | | | | | Merge "Finish any enter animation when jumping to state."Jeff Sharkey2011-06-241-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Finish any enter animation when jumping to state.Jeff Sharkey2011-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views"Adam Powell2011-06-241-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug 4903822 - vertical gravity bugs in action bar custom viewsAdam Powell2011-06-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20a319bf8fd5b5acf823a2651639f94d6efac5e4
* | | | | | | | | Merge "Introduce MarginLayoutParams marginStart and margingEnd"Fabrice Di Meglio2011-06-248-12/+425
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Introduce MarginLayoutParams marginStart and margingEndFabrice Di Meglio2011-06-248-12/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update BiDiTest app for adding more unit tests concerning margin Change-Id: Ia6a7e0a1948a2c375e8f3cc87d120a85351a8c27
* | | | | | | | | | Merge "Update GLTextureView sample to do something real."Romain Guy2011-06-241-13/+172
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update GLTextureView sample to do something real.Romain Guy2011-06-241-13/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I55a62434ae0b602522221689626f6b4155bd0d91
* | | | | | | | | | | Merge "LockScreen layout, button style, and owner info fixes - enable ↵Jim Miller2011-06-2411-137/+211
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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."
| * | | | | | | | | | | LockScreen layout, button style, and owner info fixesJim Miller2011-06-2411-137/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | | | | | Merge "Don't set texture parameters on every frame."Romain Guy2011-06-242-35/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Don't set texture parameters on every frame.Romain Guy2011-06-242-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec368405ad6a4ccfd569a0b3b4d681871a770396
* | | | | | | | | | | Merge "Properly tear down TextureView"Romain Guy2011-06-244-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Properly tear down TextureViewRomain Guy2011-06-244-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic23cd9257889d0abe8cc3fc1d04a66d0505e383e