Merge commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9'
* commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9':
add feedback test with gsm7bit special case characters
Merge commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc'
* commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc':
Hold the current transport instantiated all the time.
* changes:
MemoryFile.isMemoryFile was internally determining the length of the ashmem region. This is actually useful information to have, so expose that more directly.
Merge commit '63d2700036d0f73cbde27f0fa724d30045b4bb07'
* commit '63d2700036d0f73cbde27f0fa724d30045b4bb07':
Allow privileged callers to schedule a backup pass for any app.
- Instead of passing the suggest provider component name as the field
EXTRA_DATA, we now pass via the field COMPONENT_NAME
- Kept EXTRA_DATA field as is so we can use it for real extra data.
Merge commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f'
* commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f':
Fixes#1899284 and #1899287. Give applications more control over the gesture's path.
commit 9798cd23605c96c1d6a29202f4d31f5454079b61
Author: Mitsuru Oshima <oshima@google.com>
Date: Tue Jun 16 13:50:44 2009 -0700
Made other toShortString in performDestroyActivity safe.
commit 19bf973df81d9d01210effb39c99e5236f2229c1
Author: Mitsuru Oshima <oshima@google.com>
Date: Fri Jun 12 15:50:03 2009 -0700
* component can be null after destory?
This was causing NPE in catch block, which hides the actual exception.
Conflicts:
core/java/android/app/ActivityThread.java
We no longer instantiate the transport just for the duration of handling a
backup or restore operation. Instead, we hold the object forever (replacing it
if instructed to do so). This makes it easier for transports to watch system
state and help set backup timing policy.
Also fixes up the IBackupTransport documentation a bit.
Merge commit 'f1170fb5386ea86d704480d321ee9d1ee4858244'
* commit 'f1170fb5386ea86d704480d321ee9d1ee4858244':
Updating TTS engine interface for setting the language based on language, country and variant codes
This change adds new APIs to control the gesture's path by deciding whether the
path should be drawn and by getting the ability to get the Path itself and
draw it differently.
* changes:
Updating TTS engine interface for setting the language based on language, country and variant codes coming from a java.util.Locale instance.
The 'list sets' and 'restore token#' commands from bmgr now do what they are
supposed to. At this point we see the restore target's data being cleared
properly and its agent being launched and invoked for restore.
As with the recent change to make a touch bring up the WebTextView,
so that the trackball can be used, and we get text editing goodness,
we also need to bring up the WebTextView when clicking the trackball.
Also do not call overrideUrlLoading for an input field and add a
comment.
Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab'
* commit '653349fe48f2995d9e17b5e0a4110925cffdaeab':
Change the first parameter of Keystore.generateKeyPair() to int.
