Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab'
* commit '653349fe48f2995d9e17b5e0a4110925cffdaeab':
Change the first parameter of Keystore.generateKeyPair() to int.
Merge commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630'
* commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630':
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
Fix IntentFilter constructor to properly process the action parameter.
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'
* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'
* commit 'a03f046522f568a79b75556aa54c0407b1151511':
hide the new constant as it is pending api approval
Merge commit '7d143b89b714e077f8fd7dbac80945c76bfd9814'
* commit '7d143b89b714e077f8fd7dbac80945c76bfd9814':
Add the extra data definition for append location in the VIEW request to the Browser.
The old code put the textfield in focus, and resulted in editing
the text semi-appropriately, but now we actually bring up the
WebTextView so that we properly handle the arrow keys, as well
as any substitution that is necessary. This fixes
http://b/issue?id=1918883
Make the blinking caret active when the user actually starts editing
text. To be consistent with that idea, do not rebuild the WebTextView
when the WebView regains focus. Now sendMouseMoveIfLatest takes a
boolean parameter to determine whether to make the focusController
inactive. Requires a matching change in webkit to pass a parameter
to the method. Now that we only call setFocusControllerActive with
false, change the method to no longer take a boolean parameter.
Change names to reflect that.
This change also reflects a behavioral change. If the WebView or
its window lose focus, we do not restore the blinking caret when
focus returns.
Do not disable a route unless routes is zero, to avoid accidentally disabling
if the same route is enabled twice in a row.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Apps targeting Donut and newer will throw an exception.
We use a heuristic to determine whether an app is pre-Donut or not:
We take the address space's __progname, and use that as the application's
package name. For simple applications this is correct.
* changes:
Bug fixes. TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex. Add matrix support classes. Add test app rollo
Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'
* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
Add a Gservices setting to have a "use location for better search".
* changes:
process: Fix bug where if a thread exited while we were changing its control group, we'd bail out and report an exception. This situation is *not* an error.
