9801 Commits

Author SHA1 Message Date
Mike Reed
a01dc0fc59 am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair
Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-mr2

* commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80':
  do not merge
2009-10-29 01:20:26 -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
Scott Main
5eb80efb69 am 3534dadd: docs: fix XSS vulnerability in search
Merge commit '3534daddeefefbd42ea0a3819348327e5d85315c' into eclair

* commit '3534daddeefefbd42ea0a3819348327e5d85315c':
  docs: fix XSS vulnerability in search
2009-10-28 23:32:13 -07:00
Fred Quintana
9efe265f08 unhide AccountManagerResponse 2009-10-28 23:04:35 -07:00
Wu-cheng Li
4cb04c4654 Use image rect information to display zoomed picture. 2009-10-29 13:20:26 +08: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
Jason Sams
eab4c75b09 Fix type in Java enums. Not currently used, easier to fix now than when apps are using it. 2009-10-28 17:40:13 -07: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
Android (Google) Code Review
0410466527 Merge change I911458a0 into eclair
* changes:
  Fix x offset for boxed textures
2009-10-28 19:02:24 -04: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
a47a1e77a4 Merge change Ic03d28b9 into eclair
* changes:
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
2009-10-28 18:28:42 -04:00
Marco Nelissen
911458a081 Fix x offset for boxed textures 2009-10-28 15:10:56 -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
Mathias Agopian
85ade33edc fix [2071412] work around mdp 32-bits fade limitation
in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending),
we first make a copy of the background into a RGB buffer, then we blend the 32-bits
surface as usual (without the alpha component), and finally blend the copy of
the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
2009-10-28 14:49:44 -07:00
Suchi Amalapurapu
c03d28b9e9 Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would
have become visible since the keyguard just got dismissed.
This causes unnecessary focus changes due to changes in visibility of current window.

This will resolve issues related to current focus and time outs when dispatching key events.
2009-10-28 14:47:45 -07:00
Scott Main
3534daddee docs: fix XSS vulnerability in search
add a function that uses replace() to replace all
instances of '<' and '>' with the HTML entities and use
this wherever the query text is added onto the page.
2009-10-28 14:42:40 -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
Jack Wang
075997f12e PerformanceCollector: Collect & report perf measurements in key/value form
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
  2218327 and 2118268
- Added PerformanceCollectorTest to small suite
2009-10-28 14:32:05 -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
Android (Google) Code Review
763ccae7d7 Merge change I8e7f5f07 into eclair
* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-28 15:09:29 -04:00
Christopher Tate
405d089863 DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Because of the asynchronous behavior of keyguard, and incall explicitly
disabling keyguard, sometimes the window manager would wind up in a state in
which the "correct" app and activity window were shown, but focus was
recalculated "too soon," at a time when keyguard was just about gone but not
quite, and incall was not yet fully shown.  In this case there was no currently
valid event target, but the final show of the incall window would not prompt a
focus recalculation, so that "no current focus" state would incorrectly persist,
resulting in spurious ANRs until some other phone activity forced a focus
update.

We now detect the problematic case when windows are shown, and make sure to
recalculate focus explicitly thereafter.  This change does *not* fix the
underlying race conditions that have been resulting in mismatched state within
the window manager, but it does force a validation pass that puts things in
order so that normal operation can continue.

Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
2009-10-28 11:52:58 -07: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
Wink Saville
02d89898c9 am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 11:42:07 -07:00
Mike Lockwood
8d1eeb2144 am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2

* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 11:41:10 -07:00
Mike Lockwood
7c64d4486a am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '8061f64f6246116381131fc7951b6d88be37161a' into eclair-mr2

* commit '8061f64f6246116381131fc7951b6d88be37161a':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 11:40:47 -07:00
Scott Main
25aa87b2fd am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair

* commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98':
  docs: add 2.0 video to developer site feature videos
2009-10-28 11:40:09 -07:00
Dirk Dougherty
340fbc36fb am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair

* commit '5a4d66965d3c5061d47201fcaa62c90d126e7187':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:39:55 -07:00
Dirk Dougherty
4c071f0d69 am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-mr2

* commit '59625fa86ad0e520931361aba120e2d868f01618':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 11:39:48 -07:00
Scott Main
66e6925154 am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-mr2

* commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 11:39:26 -07:00
Dirk Dougherty
5397650963 am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2

* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
  doc change: fix broken link at top of installing doc
2009-10-28 11:39:04 -07:00
Yu Shan Emily Lau
42ea8dc732 am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00
Dave Sparks
5a7691f0e1 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 11:38:08 -07:00
Brett Chabot
622b190c87 am b81df8e3: Merge change I5535bbdf into eclair
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
2009-10-28 11:37:42 -07:00
Andreas Huber
013ecbfca2 am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 11:37:16 -07:00
Android (Google) Code Review
d14f1bd7e4 Merge change Iacb6e122 into eclair-sdk
* changes:
  docs: add 2.0 video to developer site feature videos
2009-10-28 14:27:48 -04:00
Scott Main
3141c707b8 docs: add 2.0 video to developer site feature videos 2009-10-28 11:21:31 -07:00
Jaikumar Ganesh
9fa7048ca3 am 6158038a: Merge change I2811f162 into eclair
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:11 -07:00
Mike Lockwood
4dee223c68 am 86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '86328a99bd55532e318441d48ee9eb96cdc42403' into eclair-mr2

* commit '86328a99bd55532e318441d48ee9eb96cdc42403':
  LocationManagerService: clear calling identity in mock provider calls.
2009-10-28 10:28:19 -07:00
Mike Lockwood
ed7755cc30 am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2

* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2009-10-28 10:27:45 -07:00