Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-plus-aosp
* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-plus-aosp
* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).
The IME will respect this shortly.
http://b/2228562
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-plus-aosp
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-plus-aosp
* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-plus-aosp
* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
* changes:
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-plus-aosp
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-plus-aosp
* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
process: Add debug code to log process group transitions
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
* changes:
When upgrading packages with shared user ids make sure we are eliminating the package about to be deleted or upgraded when updating permissions associated with the shared user. Include a simple null check when retrieving the permission.
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.
Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
Merge commit '38a9becfdd23e582571f624b624680cc5938d423' into eclair-plus-aosp
* commit '38a9becfdd23e582571f624b624680cc5938d423':
Import revised translations. DO NOT MERGE
The typical usage pattern for the get_char helper function is:
bool thrown = false;
n = get_char(env, s, 0, 1000, &thrown);
n += get_char(env, s, 1, 100, &thrown);
n += get_char(env, s, 2, 10, &thrown);
n += get_char(env, s, 3, 1, &thrown);
if (thrown) return false;
As you can see, get_char is called multiple times before the
thrown flag is checked. If the input text contains multiple
incorrect characters, then we have to guard against throwing
the same exception multiple times. (Because doing so will
cause the Dalvik runtime to abort.)
The fix is simple: modify get_char to check if an exception
has already been thrown before throwing a new exception.
Merge commit '31957f1badbb900bbfe211317e1ea992d650a72d' into eclair-plus-aosp
* commit '31957f1badbb900bbfe211317e1ea992d650a72d':
- add javadoc for the account manager
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-plus-aosp
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
