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.
Merge commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8' into gingerbread-plus-aosp
* commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8':
Don't drop a late frame which may lead to missing I frames in the MP4 file
Merge commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90' into gingerbread-plus-aosp
* commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90':
Return error from MPEG4Writer stop() if the check on codec specific data failed
Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp
* commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c':
Text selection without trackball.
Cleaned up some typos and other small fixes in SMSDispatcher in
preparation for checking in my SMS bug fixes. This change doesn't
fix any bugs, but it shouldn't introduce any either.
- Removed unused import statements
- Removed unused private constants and fields
- Fixed typos in Java comments and private constants
- Added generic type parameter to mSTrackers ArrayList
- Removed unnecessary casts
- Fixed indentation of mResultReceiver in SMSDispatcher
- Removed call to get unused smsc in CDMA sendSMS()
- Changed "|=" to "=" in boolean assignment where the variable
was initialized to false (thus the two operators are equivalent)
Change-Id: Ic19a63a7ef5cdccc7be86043c2a1b863ec8af652
Backported from HC.
Squashed commit of the following:
commit af214a595c7a9fdd11a2dc384f7d4665abf751c0
Fixes in TextView's selection.
commit eb9fd59ebe6500a66c2003d46b5802299970ae8d
TextView with Selection Contextual Mode
commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4
Cosmetic changes around TextView.
commit d4b4b054e87480d984ad18766f5e76553e3080d8
Double and one and a half tap removed from TextView.
commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5
Selection handlers in TextView
commit 832be74a5394649e28927484d9a86c6d53b430e7
New cursor controller in TextViews.
Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp
* commit '189de2820932fd5dc98b9639fdc420a57cfa2316':
Fix for a Resource system bug that displayed the wrong name for missing asset.
Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp
* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
DO NOT MERGE. Fix the build.
I didn't reproduce the bug and cannot ensure that this will fix it. The monkey
with identical parameters stops with an ANR.
Bug http://b/issue?id=2931528
Change-Id: I45f156c6a694f2d67fe514e0f0bb367aa017f08e
Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp
* commit '288471d8a57e1c318742cbfc28697877436fdb87':
DO NOT MERGE. Load assets in place instead of deferring until draw.
Before this change, all framework assets would be decoded at drawing time
outside of zygote. This was forcing all apps to re-decode the assets and
zygote to keep an in-memory copy of each asset. This behavior is now
opt-in by setting the inPurgeable flag on BitmapFactory.Options.
Change-Id: Ief823139163d8071b8ee1267746622faf52eb8ec
Merge commit 'a695cbc94355017d02a3a6c17d866776a8eee24c' into gingerbread-plus-aosp
* commit 'a695cbc94355017d02a3a6c17d866776a8eee24c':
make android_id random seed depend on time as well as ro.serialno
Merge commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread
* commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc':
make android_id random seed depend on time as well as ro.serialno
Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp
* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
Make MediaWriter stop and pause return errors if necessary
