Merge commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111'
* commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111':
Moved error status from SpeechServiceRecognizerListener
Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3'
* commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3':
Capture the memory output before the playback and record start.
Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'
* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
Catch when a file resource (non values) added in an overlay.
File resources are assigned resource id's and if an overlay adds one
it renumbers things and breaks compatability. Used to segfault
if you tried before, but now catches it and lets you know what file
caused the problem.
Also, set focusControllerActive state based on presence of
focus and cursor that wants key events.
Disable focusControllerActive when moved cursor wants key
events.
Remove unused recompute-focus code.
Previously, many methods, variables, etc referred to the focus.
Now, they have been changed to refer to the cursor when
appropriate. Some references were changed to the focusCandidate,
since they may apply to either the focus or the cursor, which
is a candidate for focus. Also removed unneeded method
unblockFocus. WebView will not work without a corresponding
change in external/webkit.
Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36'
* commit '58c244125fc2d2067bf89e67a154f6ca2421fe36':
Check AirplaneMode when enabling Bluetooth has finished.
Restore is a fairly complicated, somewhat stateful process, so we introduce
a new interface to encapsulate the various bits and pieces into a nicely
separable component. In particular, this will make it much cleaner to
open and interrogate an expensive-to-construct transport and then reuse it
for the actual restore process itself.
Merge commit 'b4a6188a74273611abcae05f3a3b1f0547548301'
* commit 'b4a6188a74273611abcae05f3a3b1f0547548301':
Add rough-draft restore API set to IBackupTransport
* getAvailableBackups returns the list of backup sets available for restore
* getAppSet() returns the set of apps available from a given backup set
* getRestoreData() streams the full backup data for a given application
(within a given backup set) into a FD; that data will be handed to the
app's backup agent for processing.
Instead of just passing a package name to performBackup, pass the whole
PackageInfo struct, explicitly including the list of signatures for the package.
No need to make each transport look this up individually when it's a necessary
part of the backup payload for each app.
The changes from 090602 update frameworks/base to support 3way calling
and call waiting.
The changes from 090603 completed the CdmaInformationRecords class
but the original changes submitted has been simplified, toString added
and a bug fixed where the notifications where not being handled properly.
The changes from 090605 added Prl Version, apn fixes.
Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3'
* commit '19cd309f9eccdf8454dc6e5076013588b7a170a3':
Add the EAP related fields for WiFi configuration.
Merge commit '6fa959769051f08655292ec47aa8480b248b67fd'
* commit '6fa959769051f08655292ec47aa8480b248b67fd':
Apply OOM adjustment while an app is undergoing backup
Merge commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12'
* commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12':
Cleaning up comments in interface for TTS engines.
Merge commit '327da854e8fbc444150b40941668b3c9187c34b9'
* commit '327da854e8fbc444150b40941668b3c9187c34b9':
Updating TtsEngine.h and SynthProxy.cpp so that buffer memory
Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1'
* commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1':
Add a new attribute to android manifest for defining the GLES version number.
Merge commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a'
* commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a':
Fix parameter mismatch for a couple of RIL commands.
Merge commit '7b0d2d933d8a601cf6259f25576f5615ff146b33'
* commit '7b0d2d933d8a601cf6259f25576f5615ff146b33':
Adding new Settings.Secure properties for the Text-To-Speech functionality.
