Merge commit '300b0b7e2b8f0ab922e4a83755ae999da191894e' into gingerbread-plus-aosp
* commit '300b0b7e2b8f0ab922e4a83755ae999da191894e':
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
Merge commit '325192593b057f4360e1abddf490b4fae7d60b12' into gingerbread-plus-aosp
* commit '325192593b057f4360e1abddf490b4fae7d60b12':
Fix a few small battery stats problems:
according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.
Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp
* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
Tracking merge of dalvik-dev to gingerbread
- Actually aggregate discharge amounts.
- Actually print the unplugged battery info when currently plugged in.
Change-Id: I22dd6feb73ac1364eb169d3239ce403b0755bb6c
Merge commit '6be237120e9673e3cfc5243da5bbca287effcf09' into gingerbread-plus-aosp
* commit '6be237120e9673e3cfc5243da5bbca287effcf09':
Free created FileMap when uncompressing files
Remove auto-generated AIDL files and replace them with manually edited
.java and .cpp/.h files so that binder calls can be made from either
Java or C++.
Update the makefiles to not attempt to generate the AIDL files and also
remove the old auto-generated .java files.
Put all the storage-related C++ things in libstorage so that we don't
pollute other libraries.
Change-Id: I82d1631295452709f12ff1270f36c3100e652806
Merge commit 'baf72cd79c2a675c2265384eb704067ab24259a7' into gingerbread-plus-aosp
* commit 'baf72cd79c2a675c2265384eb704067ab24259a7':
DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp
* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
DO NOT MERGE Fixing Connectivity
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp
* commit '39792d2262352ae775091876d5488d2412a2ff92':
Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.
Also allow granting of permissions to services because... well,
it would be really really useful. And it introduces some
refactoring that we'll need to support cut/paste.
Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp
* commit 'b755e3256510ecd325565d6b461d668d224445b1':
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
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
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
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 '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp
* commit '271c1bfd60eaa20c3f37e685864d992e0770ac00':
Handle the camera open failure better.
Merge commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c' into gingerbread-plus-aosp
* commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c':
Use getMinFrameCount() instead of querying AudioSystem directly.
