9201 Commits

Author SHA1 Message Date
Android (Google) Code Review
d01767f8b7 Merge change I56779290 into eclair
* changes:
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 17:54:10 -04:00
Android (Google) Code Review
f989c1140b Merge change If007a2fa into eclair
* changes:
  return proper error code from eglCreateImageKHR
2009-10-30 17:54:03 -04:00
Mathias Agopian
0b0722f980 fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
2009-10-30 14:48:50 -07:00
Android (Google) Code Review
1864d01f2b Merge change Iae849da2 into eclair
* changes:
  add table maskfilter
2009-10-30 17:03:18 -04:00
Android (Google) Code Review
4d0bf1201e Merge change I08c19bee into eclair
* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 13:53:32 -04:00
Andy McFadden
08c19beee4 DO NOT MERGE: Another gcc 4.0.3 workaround.
Temporarily make a function public that doesn't need to be.  When
host gcc-4.0.3 is gone from the build servers we can undo this.

(Cherry-picked from eclair-mr2.)
2009-10-30 10:24:06 -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
Mike Reed
0e1e623011 add table maskfilter
hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
2009-10-30 08:11:58 -04:00
Jeff Sharkey
824838d74e Avoid NPE when callers send null selection args.
Fixes http://b/2226007
2009-10-29 17:38:27 -07:00
Mathias Agopian
f007a2faa1 return proper error code from eglCreateImageKHR 2009-10-29 16:45:41 -07:00
Android (Google) Code Review
3a8141416a Merge change Iee0486e2 into eclair
* changes:
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:01:23 -04:00
Android (Google) Code Review
5dc7a21cbb Merge change I4e036287 into eclair
* changes:
  update line test to expose some bug on SGX530 ed4
2009-10-29 18:48:10 -04:00
Mathias Agopian
4e036287fd update line test to expose some bug on SGX530 ed4 2009-10-29 15:47:12 -07:00
Gloria Wang
608a2630bb Dump media recorder PID in dumpsys media.player, and fix minor bugs. 2009-10-29 15:46:37 -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
San Mehat
957e58670b process: Disable debugging
Signed-off-by: San Mehat <san@google.com>
2009-10-29 13:59:32 -07:00
Android (Google) Code Review
3034624f68 Merge change I26a2d829 into eclair
* changes:
  Add -P flag to ps in dumpstate
2009-10-29 16:40:32 -04: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
Evan Millar
26a2d829b3 Add -P flag to ps in dumpstate 2009-10-29 12:53:46 -07:00
Android (Google) Code Review
ec1f1e3df1 Merge change Ieab4c75b into eclair
* changes:
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
2009-10-29 15:48:51 -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
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
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
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
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
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
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
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