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.
The current OpenGL ES 2.0 HardwareRenderer will fail and does not
even attempt to create a Canvas. The next step will be to create
a new native-backed Canvas that relies on OpenGL ES 2.0 and bypasses
the current OpenGL ES 1.0 implementation done in Skia.
Change-Id: I7a8e9f87f316e9137ef191bb5609213e160eaa4c
sometimes sqlite corruption is so egregious that the sqlite
doesn't even think the file is of supported formatl; ie., the file
header is bad. treat this as corruption.
this check used to be done in sqlite3.c - move it to android code
so that we have less android-changes in sqlite3.c
depends on Change-Id: I334286a1a377b962b1a97dd2af00e194f035090e
Change-Id: Ide8cd1053b1ec00372fbc87caaaaefb408ce9104
sometimes the database can be so corrupt that it cannot even be queried
for attached database list.
Change-Id: Ib8fe3bd94157acab3fbf1011c3f8a532ef5019f4
This change also prevents hardware acceleration when the ViewRoot is in the
system process. This causes problem in EGL intialization because of having
both a SurfaceControl and a Surface. This is not needed and better to leave
it off anyway (so that preview windows don't get unnecessary hw acceleration.)
Change-Id: I1cc55d7fb9a4c1a9c4c59f11f49d3e44de78acef
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
