summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make sure the reading level scale is within min/max limits." into ↵Shimeng (Simon) Wang2011-01-061-2/+3
|\ | | | | | | honeycomb
| * Make sure the reading level scale is within min/max limits.Shimeng (Simon) Wang2011-01-061-2/+3
| | | | | | | | | | | | | | | | This potentially helps the following issue. But anyway, this change is good to have. issue: 3292648 Change-Id: I0ad74b802d7ce2c3d66de8115187638f1d5e72ff
* | Merge "Reuse of native display list objects" into honeycombChet Haase2011-01-065-67/+100
|\ \
| * | Reuse of native display list objectsChet Haase2011-01-065-67/+100
| |/ | | | | | | Change-Id: Ia4553e23930ad20e56c11faa7809be788a1ad4bb
* | Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycombAndreas Huber2011-01-062-4/+4
|\ \
| * | Use NuPlayer for HTTP live streaming playback by default.Andreas Huber2011-01-062-4/+4
| | | | | | | | | | | | | | | | | | Reversed the property logic, set media.httplive.disable-nuplayer to true to revert Change-Id: I1057940667aaab56bb75c9ea15c2cdcab736f3c6
* | | Merge "Add temporary hack for keyboards not following spec." into honeycombJaikumar Ganesh2011-01-061-8/+19
|\ \ \
| * | | Add temporary hack for keyboards not following spec.Jaikumar Ganesh2011-01-061-8/+19
| | | | | | | | | | | | | | | | Change-Id: Ic206d45e54f0dc2ccf8124adb08df0c768d7e130
* | | | Merge "Follow the spec recommendation for keyboard pairing." into honeycombJaikumar Ganesh2011-01-063-40/+137
|\ \ \ \ | |/ / /
| * | | Follow the spec recommendation for keyboard pairing.Jaikumar Ganesh2011-01-063-40/+137
| | | | | | | | | | | | | | | | | | | | | | | | Generate a variable pin and show it to the user. Change-Id: Id4aae7a16f25c67d6c6ead6fd936cb14087f3c7a
* | | | Merge "Add camera service support for SurfaceTexture." into honeycombJamie Gennis2011-01-068-26/+95
|\ \ \ \ | |_|/ / |/| | |
| * | | Add camera service support for SurfaceTexture.Jamie Gennis2011-01-068-26/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the destination of camera preview frames. Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
* | | | Merge "Colorconverter may not support some src/dst bitmap configurations." ↵Andreas Huber2011-01-063-32/+63
|\ \ \ \ | | | | | | | | | | | | | | | into honeycomb
| * | | | Colorconverter may not support some src/dst bitmap configurations.Andreas Huber2011-01-063-32/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let it return an appropriate error code instead of asserting. Change-Id: I7fe0dfa169e1cbdecb04c5fcbe8501e73362d05e related-to-bug: 3328212
* | | | | Merge "If we failed to initialize the codec after transitioning to IDLE ↵Andreas Huber2011-01-061-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | state, don't assert" into honeycomb
| * | | If we failed to initialize the codec after transitioning to IDLE state, ↵Andreas Huber2011-01-061-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | don't assert during shutdown. Change-Id: I40ac44260fb136c15d6dcb9f5ad62211640c66ec related-to-bug: 3328222
* | | Add the SurfaceTexture C++ implementation.Jamie Gennis2011-01-068-2/+1047
| |/ |/| | | | | | | | | | | | | | | | | This change adds the C++ implementation of SurfaceTexture and related classes. The goal of this is for a SurfaceTexture to be passed to camera service or Stagefright in place of a Surface to allow camera preview or decoded video frames to be streamed to an OpenGL ES texture that an application can use. Change-Id: I55c83a7017f1ecb81c9c9e3252cbd118b914296c
* | Add the ISurfaceComposer::createGraphicBuffer IPC.Jamie Gennis2011-01-064-0/+61
|/ | | | | | | | This change adds a new binder method to the ISurfaceComposer interface. This IPC is intended to allow SurfaceFlinger clients to allocate gralloc buffers using SurfaceFlinger as a proxy to gralloc. Change-Id: Ide9fc283aec5da6268ba62cfed0c3319a50b640d
* Merge "requery() should close cursorwindow insead of setting it to null." ↵Vasu Nori2011-01-062-5/+21
|\ | | | | | | into honeycomb
| * requery() should close cursorwindow insead of setting it to null.Vasu Nori2011-01-062-5/+21
| | | | | | | | | | | | just in case GC takes a while to kick in. Change-Id: I3a00b52afe1303be0c7d6bb561e5c07734e4dcb3
* | Merge "set default mode of WAL to be off." into honeycombVasu Nori2011-01-061-7/+1
|\ \
| * | set default mode of WAL to be off.Vasu Nori2011-01-061-7/+1
| |/ | | | | | | | | | | apps will have to enable WAL explicitly. Change-Id: Iba5c47a40f465e668ef0d538282230e99fe04ce6
* | Merge "Fix bug 3327227 - Adjust overflow menu padding" into honeycombAdam Powell2011-01-061-1/+3
|\ \
| * | Fix bug 3327227 - Adjust overflow menu paddingAdam Powell2011-01-061-1/+3
| | | | | | | | | | | | Change-Id: I1d946655aecfcd1965471dbd32958bf8c0c38e76
* | | Merge "pass enter key to webkit more often" into honeycombCary Clark2011-01-061-4/+9
|\ \ \ | |/ / |/| |
| * | pass enter key to webkit more oftenCary Clark2011-01-061-4/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If the cursor is active and on a node that doesn't want key events, treat the enter key as a click. Otherwise, pass key down and key up to webkit. A companion change in external/webkit adds frames as nodes that wants key events. bug:3325093 Change-Id: I134d2999505925ee1e571841759cb295103b5a30
* | Cherry-pick 9b53dd9d60a01ddb1307177c296c7b4fd6114753 from masterXavier Ducrohet2011-01-061-17/+11
| | | | | | | | | | Change-Id: I670872542feb62c47fe693eb183b19e2eef2b20d LayoutLib: use new API with log in init method.
* | Tidy up CacheManager comments and documentationSteve Block2011-01-061-49/+53
| | | | | | | | Change-Id: I3a7d3836a51ef3092652ade87f29bc84af69ee7d
* | Remove an unused non-public CacheManager methodSteve Block2011-01-061-7/+0
| | | | | | | | Change-Id: Ia0bef0a66167ce948802701e1dd85e82b937dbdf
* | Temporarily remove UsbManager support for USB host.Mike Lockwood2011-01-068-298/+1
| | | | | | | | | | | | | | A new USB host API will be added in an upcoming commit Change-Id: I5816c10c7acd236d31ab8ae255fc83c77121eea0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Remove support for obsolete PTP content providerMike Lockwood2011-01-0610-1538/+0
| | | | | | | | | | | | | | This will be replaced by a new PTP host API in an upcoming commit. Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Remove CameraBrowser test appMike Lockwood2011-01-0612-950/+0
| | | | | | | | | | Change-Id: I7e04ef674746c5c2cdf421a2b9ec440d7ea831bd Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: changes to use new usb_request support in libusbhostMike Lockwood2011-01-0613-91/+127
|/ | | | | Change-Id: Ic091eab166a66efcde0395dcebbbc513f2322fca Signed-off-by: Mike Lockwood <lockwood@android.com>
* Update WebView useragent string for merge to WebKit r72805Steve Block2011-01-061-1/+1
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I9cf18eeaa9bc6eb2964272721b686c8ea0b2b897
* Merge "Check null pointer agressively."satok2011-01-061-6/+7
|\
| * Check null pointer agressively.satok2011-01-061-6/+7
| | | | | | | | | | | | Bug: 3250622 Change-Id: I25f367ad1bd6a741282603f2f587f7a1256ef460
* | Merge "Enable built-in echo canceler if available."Chia-chi Yeh2011-01-061-3/+7
|\ \
| * | Enable built-in echo canceler if available.Chia-chi Yeh2011-01-061-3/+7
| | | | | | | | | | | | | | | | | | | | | 1. Always initialize AudioRecord with VOICE_COMMUNICATION. 2. If echo canceler is available, disable our echo suppressor. Change-Id: Idf18d3833189a8478c1b252ebe6ce55e923280b3
* | | Merge "Do not set back to AudioManager.MODE_NORMAL in SipAudioCall."Chia-chi Yeh2011-01-061-10/+0
|\ \ \ | |/ /
| * | Do not set back to AudioManager.MODE_NORMAL in SipAudioCall.Chia-chi Yeh2011-01-061-10/+0
| | | | | | | | | | | | Change-Id: I8f68e01e5f8c73bb8afd44312cbfadb55aab4330
* | | Merge "Fix a bug that could cause padded lists to draw dividers incorrectly"Adam Powell2011-01-051-2/+9
|\ \ \
| * | | Fix a bug that could cause padded lists to draw dividers incorrectlyAdam Powell2011-01-051-2/+9
| | | | | | | | | | | | | | | | Change-Id: I6483848c55567f901ac8b1628991de3343bd3f3d
* | | | am c042eb77: am 3769240b: Merge "Clear reference to the IIntentReceiver in ↵Dianne Hackborn2011-01-050-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order to avoid memory leak" * commit 'c042eb77a5e4c3cb4f2a886d61cff17e1c9b5aed': Clear reference to the IIntentReceiver in order to avoid memory leak
| * \ \ \ am 3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid ↵Dianne Hackborn2011-01-050-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory leak" * commit '3769240b7976bfa50bb7bf235747b7f6bb7be08e': Clear reference to the IIntentReceiver in order to avoid memory leak
| | * \ \ \ Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"Dianne Hackborn2011-01-052-1/+4
| | |\ \ \ \
| | | * | | | Clear reference to the IIntentReceiver in order to avoid memory leakJohannes Carlsson2011-01-042-1/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using sendOrderedBroadcast(..) with a BroadcastReceiver the BroadcastReceiver instance was not released. The reason for this was that the resultTo field in the BroadcastRecord kept a reference until it was pushed out of the mBroadcastHistory. This reference in turn kept a reference to the process side IIntentReceiver (implemented in ReceiverDispatcher$InnerReceiver). This in turn had a strong reference (through mStrongRef) to the Context. In order to keep the debug output the resultTo is also kept as a String in the new resultToString variable. Change-Id: I4382a22a541c27b3694fb2b78a04ee820b235f8f
* | | | | | am 73fef3c7: am b5a8654d: Clear reference to the IIntentReceiver in order to ↵Johannes Carlsson2011-01-052-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid memory leak * commit '73fef3c7c0986468d75e3ef09d2255c3509a80c9': Clear reference to the IIntentReceiver in order to avoid memory leak
| * | | | | am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory ↵Johannes Carlsson2011-01-052-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leak * commit 'b5a8654dea9ea8443b41f8ff3668ae4074e13a07': Clear reference to the IIntentReceiver in order to avoid memory leak
| | * | | | | Clear reference to the IIntentReceiver in order to avoid memory leakJohannes Carlsson2011-01-052-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using sendOrderedBroadcast(..) with a BroadcastReceiver the BroadcastReceiver instance was not released. The reason for this was that the resultTo field in the BroadcastRecord kept a reference until it was pushed out of the mBroadcastHistory. This reference in turn kept a reference to the process side IIntentReceiver (implemented in ReceiverDispatcher$InnerReceiver). This in turn had a strong reference (through mStrongRef) to the Context. In order to keep the debug output the resultTo is also kept as a String in the new resultToString variable. Change-Id: I4382a22a541c27b3694fb2b78a04ee820b235f8f
* | | | | | | am 4302886f: am c91f9fe5: Merge "Avoiding cyclic references when unbinding ↵Dianne Hackborn2011-01-051-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | from a service" into gingerbread * commit '4302886f8f77c3f53cdc094069f3550dd56bc812': Avoiding cyclic references when unbinding from a service