4676 Commits

Author SHA1 Message Date
Jaikumar Ganesh
bf2efbc064 am 3cf254d2: Merge change I4b3db907 into eclair
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
2009-10-30 10:31:25 -07:00
Android (Google) Code Review
3cf254d2ba Merge change I4b3db907 into eclair
* changes:
  Revert the channge where channels were not selected randomly.
2009-10-30 13:23:43 -04:00
Jaikumar Ganesh
4b3db907f0 Revert the channge where channels were not selected randomly.
The Bluez SDP bug has been fixed.
Reverting parts of the commit: 16fb88a673c41b93c5d57ccb28c2697e7d87701a

Bug: 2173752
Dr No: Eastham
2009-10-30 09:37:25 -07:00
Jeff Sharkey
5546e9e672 am 824838d7: Avoid NPE when callers send null selection args.
Merge commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b' into eclair-mr2

* commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b':
  Avoid NPE when callers send null selection args.
2009-10-29 19:35:32 -07:00
Fred Quintana
6b9954790e am fae288c7: Merge change I9efe265f into eclair
Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-mr2

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse
2009-10-29 19:33:09 -07:00
Ed Heyl
7fb4e4aaf2 am 154d61fc: Merge change Id6f158b3 into eclair
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2

* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
  Removed javadoc link to hidden class (temporary fix for build)
2009-10-29 19:32:23 -07:00
San Mehat
67ef832cdb am 957e5867: process: Disable debugging
Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
  process: Disable debugging
2009-10-29 19:32:06 -07:00
Costin Manolache
492dbe1752 am 4388b988: Merge change Idc4c7714 into eclair
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2

* 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.
2009-10-29 19:30:43 -07:00
Jeff Hamilton
cd79e5e173 am b5c05516: Merge change I3b7d5cbe into eclair
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-mr2

* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
2009-10-29 19:29:16 -07:00
San Mehat
574b99bfcd am 8e312e81: Merge change Ia5109a87 into eclair
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2

* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
  process: Add debug code to log process group transitions
2009-10-29 19:28:58 -07:00
Jack Palevich
5be6eedf3b am b575e4df: Merge change I4a943184 into eclair
Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
  Avoid trying to throw multiple exceptions at once.
2009-10-29 19:28:38 -07:00
Suchi Amalapurapu
a7bbedca97 am 22dad592: Merge change I6cae32c7 into eclair
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2

* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
  When upgrading packages with shared user ids make sure we are eliminating
2009-10-29 19:26:46 -07:00
Marco Nelissen
c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Jeff Sharkey
824838d74e Avoid NPE when callers send null selection args.
Fixes http://b/2226007
2009-10-29 17:38:27 -07:00
Android (Google) Code Review
fae288c798 Merge change I9efe265f into eclair
* changes:
  unhide AccountManagerResponse
2009-10-29 17:47:52 -04:00
Android (Google) Code Review
154d61fc99 Merge change Id6f158b3 into eclair
* changes:
  Removed javadoc link to hidden class (temporary fix for build)
2009-10-29 17:08:34 -04:00
Android (Google) Code Review
758b5b25f0 Merge change I35155c1d into eclair-mr2
* changes:
  divide mRestoredScale before use
2009-10-29 16:59:39 -04:00
San Mehat
957e58670b process: Disable debugging
Signed-off-by: San Mehat <san@google.com>
2009-10-29 13:59:32 -07:00
Fred Quintana
0fca5b45ff am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2

* commit '5e5eb393729630800079206498f283de8f02f3a7':
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-29 13:44:08 -07:00
Android (Google) Code Review
4388b98845 Merge change Idc4c7714 into eclair
* 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.
2009-10-29 16:18:35 -04:00
Costin Manolache
88a211b148 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. 2009-10-29 13:14:47 -07:00
Cary Clark
35155c1d8b divide mRestoredScale before use
Also add debugging to help find incorrect width bug (see bug)

fixes http://b/issue?id=2218767
2009-10-29 15:34:00 -04:00
Android (Google) Code Review
b5c05516ba Merge change I3b7d5cbe into eclair
* changes:
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
2009-10-29 15:11:40 -04:00
Android (Google) Code Review
8e312e8160 Merge change Ia5109a87 into eclair
* changes:
  process: Add debug code to log process group transitions
2009-10-29 15:02:53 -04:00
San Mehat
a5109a878e process: Add debug code to log process group transitions
Signed-off-by: San Mehat <san@google.com>
2009-10-29 11:50:43 -07:00
Ed Heyl
d6f158b368 Removed javadoc link to hidden class (temporary fix for build) 2009-10-29 10:18:45 -07:00
Android (Google) Code Review
b575e4dffe Merge change I4a943184 into eclair
* changes:
  Avoid trying to throw multiple exceptions at once.
2009-10-29 13:02:53 -04:00
Leon Scroggins
5de6389f22 DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Fixes http://b/issue?id=2222706

Requires a change in external/webkit.  Not merging because the
change in webkit should be altered slightly.
2009-10-29 12:52:11 -04:00
Android (Google) Code Review
3fc145aafd Merge change Ie8672184 into eclair-mr2
* changes:
  Add error code column to SMS
2009-10-29 11:07:15 -04:00
Ying Wang
102767cd3b am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.
2009-10-29 01:23:58 -07:00
Dianne Hackborn
40946aa201 am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2

* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
  Add SDK version for MR1.
2009-10-29 01:20:01 -07:00
Android (Google) Code Review
22dad5928d Merge change I6cae32c7 into eclair
* 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.
2009-10-29 03:55:49 -04:00
Suchi Amalapurapu
d83006cbe8 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.

Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
2009-10-29 00:46:55 -07:00
Fred Quintana
9efe265f08 unhide AccountManagerResponse 2009-10-28 23:04:35 -07:00
Eric Fischer
38a9becfdd Import revised translations. DO NOT MERGE 2009-10-28 21:16:52 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21().
Internal issue number: 2079082
2009-10-29 12:24:26 +09:00
Jack Palevich
4a94318454 Avoid trying to throw multiple exceptions at once.
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.
2009-10-28 19:38:05 -07:00
Daisuke Miyakawa
d95a02c2a6 Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
2009-10-29 11:01:07 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2
* changes:
  Add partial support of Android-specific properties.
2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties.
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
2009-10-29 09:16:31 +09:00
Fred Quintana
31957f1bad - add javadoc for the account manager
- add some checks to the AccountManagerService to keep it from crashing when a null is passed in
- cleaned up the API a bit
2009-10-28 16:29:21 -07:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
2009-10-28 15:49:11 -07:00
Android (Google) Code Review
5e5eb39372 Merge change Id572ffc7 into eclair
* changes:
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-28 18:05:09 -04:00
Fred Quintana
cb41faa285 don't throw an exception when we can't find a pending sync operation in the database 2009-10-28 14:52:33 -07:00
Tom Taylor
e867218433 Add error code column to SMS
Also add code to save an error code in the DB.
2009-10-28 14:38:44 -07:00
Android (Google) Code Review
10d32a338d Merge change I16dc1411 into eclair-mr2
* changes:
  add boundary patch
2009-10-28 15:37:34 -04:00
Mike Reed
c04851fd0a add boundary patch 2009-10-28 15:18:41 -04:00
Jeff Hamilton
acff20bda4 Copy the selection args when creating a CPO since callers often reuse the passed in array.
Bug: 2221947
Change-Id: I3b7d5cbef61777d76ca7fc0d7c91c44553e609a9
2009-10-28 14:17:05 -05:00
Amith Yamasani
26d4e53967 am 678cdbe5: Fix build.
Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-mr2

* commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937':
  Fix build.
2009-10-28 11:42:56 -07:00
Amith Yamasani
4ac5066d53 am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2

* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 11:42:35 -07:00