Merge commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp
* commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
More StrictMode work, handling violations in ActivityManagerService.
The purpose of this patch is to add a C-based ABI that can be exposed by the NDK
for developers wanting to write a TTS Engine. This replaces the C++ ABI that is
currently under frameworks/base/include/tts/TtsEngine.h but is *binary* compatible
with it.
As a consequence, the svox pico plugin under external/svox/pico/tts/, which
links against tts/TtsEngine.h can be loaded by the TTS service properly.
Another patch would modify the pico tts to use <android/tts.h>, then we will
be able to get rid of <tts/TtsEngine.h> in the source tree.
Change-Id: I16844cef9b5b006cc32655a29e4f9f193c8c1a91
Merge commit '3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp
* commit '3a010fa6192f09121fc920810c5a8366b5b09f46':
Doc change: remove pdf summary of guidelines from templates archive.
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp
* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
Must hold lock here...
Merge commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp
* commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc':
Dont persist config on failure
If soft AP bring up does not go through successfully,
dont persist the config. This has the benefit of recovering
from the case where things fail on "=" and "," for SSID since
the IOCTL parsing in driver on broadcom cannot handle it
at this time.
Change-Id: Iaa60fd05972db434500753dcb59092995dab07b1
Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'
* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
Initial checkin for pause and resume control
Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp
* commit 'f62c57d684b83df7d2817db976c0afdb500ae92a':
Initial checkin for pause and resume control
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'
* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Merge commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp
* commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Modify OOM adj classes a bit, to take into account the new
heavy weight app type, and give "foreground services" their
own category to have a bettery chance to manager them when
things go wrong.
Also add some new code to battery stats to keep a history
of changes to the battery level.
Change-Id: I29f5ab6938777e1a7eafd7d8c38b5e564cc9f96a
Merge commit 'b165719e93dd390b4f71f5d5e993880529cc841f'
* commit 'b165719e93dd390b4f71f5d5e993880529cc841f':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp
* commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
This is the final CL in a series of CL's that moved the
location of the zoom logic from WebView to ZoomManager.
Change-Id: Ie1e80b9b3108bd4cb0b0ee2822dc984da91c2d86
http://b/2671604
This CL is one in a series of CL's that is intended to refactor
the zoom logic from WebView to ZoomManager.
Change-Id: Icf88f7bd45068dddb31913903403acc7a8f21063
http://b/2671604
Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'
* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
Change camera interface to support multiple cameras.
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp
* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
Change camera interface to support multiple cameras.
