Merge commit '97a56269d06770712f9da7a2a29385012ec9714e' into gingerbread-plus-aosp
* commit '97a56269d06770712f9da7a2a29385012ec9714e':
Add camera fps range API.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.
Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
This is needed for https://android-git.corp.google.com/g/#change,62114.
inputStreamForAndroidResource returns an InputStream for a given url
readFromStream is a static method that just reads from a given stream, and catches any exceptions
Change-Id: I4f744bfe851c6d13e16c8eb7f89981cf306d175c
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed. Fixed differently on master.
bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp
* commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c':
DO NOT MERGE Refactor find and select dialogs
(Merged by hand from master, based on
https://android-git.corp.google.com/g/#change,53490 )
In WebView:
- Remove the select mode, so that while text is selected,
the view may respond to scroll or zoom gestures.
- Remove the getFindIsUp() method -- let the host application
track if the dialog is visible.
- Map long press to select text if the host application does
not already intercept it.
- Draw find 'extras' during zoom animation.
- Draw select 'extras' during animation and scrolling as well.
- Distinguish between selecting text and pressing a shift key
(the shift key is still a possible select text shortcut)
- Add more public (but hidden) interfaces: setUpSelect, selectAll, etc.
In WebChromeClient, add interfaces to allow WebView to tell the host
application that selection has started or finished. A long press on
a part of the view that does not trigger a host context menu may
start the selection (if text is underneath the press), and clicking
the trackball or tapping away from the current selection may
end the selection.
Companion changes in external/webkit and packages/apps/Browser
Change-Id: I2d41662acbdb8bdaa8219b35f18a9276e34636a7
http://b/262451
Merge commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d' into gingerbread-plus-aosp
* commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d':
SipSession: make potential time-consuming ops run on background thread
If sys_tz is not set correctly, the timestamp of
filesystem will be in-consistent with android's time,
until time zone is set from android's UI. Set kernel
timezone while initializing AlarmManagerService.
Change-Id: Ic85def954fc9388e943e3dee45767d8179825a49
This comes in the form of a command, `screenshot`, which
will read /dev/graphics/fb0 (in a manner very similar to
adb's framebuffer_service) and write to the specified PNG
file.
Additionally, dumpstate now accepts a -p flag (mnemonic:
"picture" or "png") that, when specified, will cause a
screenshot to be captured in the same directory as the
bugreport.
Future work: invoke `dumpstate -p` when the bugreport
keychord is pressed, giving users a convenient way to attach
screenshots to bug reports (or simply take screenshots at
all without developer tools).
Bug: 2216571 (and probably plenty of others)
Change-Id: I36afbc55a0308a7bc01112ef39c4c62777efb203
Merge commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c'
* commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c':
revert hwcomposer HAL changes. DO NOT MERGE.
Merge commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828' into gingerbread-plus-aosp
* commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828':
Don't recycle native bitmap after the finalizer is called.
If an object A's finalizer calls Bitmap B's recycle() when B's
finalizer is already called, we will have trouble because the
native bitmap is already freed in the finalizer.
Change-Id: Ic0be8ed75fb3aacee9ce6e3d9908178a55151eb9
Merge commit '33992d4195fe55f42ba6919f5a07707a51a12d5d'
* commit '33992d4195fe55f42ba6919f5a07707a51a12d5d':
Fix some input device mapping bugs with certain drivers.
Merge commit '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp
* commit '271c1bfd60eaa20c3f37e685864d992e0770ac00':
Handle the camera open failure better.
I was seeing a problem running RenderScript in the system process
because mNativeSurface was null. This works around the problem
by forcing the native surface to be created when we set the surface.
Change-Id: I3abf6cef1b049864e4e063669b6df547de008c93
- made width(), height() const member functions.
- added validPixel() which returns true if pixel is in the allowed range.
- now testing validPixel in get/setPixelValue
Change-Id: I1dee5060bd4f8dcbdcd542ec4647ea328f0185c3
Merge commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c' into gingerbread-plus-aosp
* commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c':
Use getMinFrameCount() instead of querying AudioSystem directly.
