Merge commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8' into eclair-mr2-plus-aosp
* commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8':
Add access to ContentProvider for SyncState.
Merge commit 'cab9cb1970c2ec41b5a497f8f5e983ae26940e41'
* commit 'cab9cb1970c2ec41b5a497f8f5e983ae26940e41':
Check for null before returing a chunk from the pool.
Merge commit '169ef4cca30c77a1a85c9684560c504a5ac230b5' into eclair-mr2-plus-aosp
* commit '169ef4cca30c77a1a85c9684560c504a5ac230b5':
Check for null before returing a chunk from the pool.
Since references can be queued in another thread, the first entry in the pool
could have been queued after processPoolLocked. Check for null and create a new
chunk if the check fails.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified.
Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
Merge commit '73b4234fadedce2866f3227e92a41c09d60ccf47'
* commit '73b4234fadedce2866f3227e92a41c09d60ccf47':
Add htm and html extensions to the map as "text/html"
Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp
* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
Add htm and html extensions to the map as "text/html"
* Fixes#2192935
* Exchange attachment handling depends on MimeTypeMap to determine the
mime type of attachments based on their file extension
Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.
Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
This fix is alrady in mr2. It does not affect sholes --
this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Clicking the trackball at the end of selecting text no longer
sends a click event.
Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
Merge commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12' into eclair-mr2-plus-aosp
* commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12':
Share chunks between all ByteArrayBuilders.
If a single ByteArrayBuilder accumulates many chunks, it is possible that many
of those chunks will not be reused and will just take up memory in the pool. If
the pool is shared across all instances, fewer chunks need to be allocated. This
allows a site like http://www.606studios.com/bendisboard/showthread.php?t=170286
to load without crashing due to OOM.
The shared pool contains SoftReferences to each chunk. If the vm feels memory
pressure, it is allowed to mark these references for collection. Before
accessing the pool of chunks, I remove any queued references from the pool.
Cleanup ByteArrayBuilder a little by removing unused methods and fields.
Document some synchronization spots in LoadListener and add a lock when
downloading a certificate.
Bug: 1637965
Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95'
* commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95':
Fix possible NPE in the code that restores widgets' state.
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp
* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
Fix possible NPE in the code that restores widgets' state.
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2
* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
Fix possible NPE in the code that restores widgets' state.
Merge commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774'
* commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774':
Do not show soft keyboard for readonly textfields.
Merge commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be' into eclair-mr2-plus-aosp
* commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be':
Do not show soft keyboard for readonly textfields.
Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5'
* commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5':
check for native initialization before calling public function
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp
* commit '9f2088240272086cd9eb94d01b1872a1088b76f2':
check for native initialization before calling public function
Part of a fix for http://b/issue?id=2159869. The request to show
the soft input has been moved to nativeTextInputMotionUp, where it
can check if the input field is readOnly. This way it is also
handled by shortPressOnTextField, for when a user shortpresses
on the field.
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.
These cases can be triggered by the monkey.
Fixes http://b/issue?id=2187719
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp
* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Clicking the trackball at the end of selecting text no longer
sends a click event.
Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
Merge commit '70d71fdcbf365ed148f2f4252a6975851424637e' into eclair-mr2-plus-aosp
* commit '70d71fdcbf365ed148f2f4252a6975851424637e':
remove the bind helper and bind directly
Merge commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017' into eclair-mr2-plus-aosp
* commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017':
add an IPC for sync initialization
Merge commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62'
* commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62':
Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
Merge commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c' into eclair-mr2-plus-aosp
* commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c':
Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
* changes:
Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
