Commit Graph

7138 Commits

Author SHA1 Message Date
Android (Google) Code Review
b4d8fbb1a7 Merge change If007a2fa into eclair
* changes:
  return proper error code from eglCreateImageKHR
2009-10-30 17:54:03 -04:00
Mathias Agopian
863e5fdde8 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
Mike Reed
f9e67e62da am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '58d30b69071363aba38307bc5ee3b2d81f22f09d' into eclair-mr2-plus-aosp

* commit '58d30b69071363aba38307bc5ee3b2d81f22f09d':
  add table maskfilter
2009-10-30 14:23:31 -07:00
Andy McFadden
da574f4bcc am a8235340: am 4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit 'a823534008afa45f61faca4088c5aabe9b956117' into eclair-mr2-plus-aosp

* commit 'a823534008afa45f61faca4088c5aabe9b956117':
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 14:23:24 -07:00
Mike Reed
e5084cd50e am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
2009-10-30 14:13:44 -07:00
Android (Google) Code Review
b4d306fb49 Merge change Iae849da2 into eclair
* changes:
  add table maskfilter
2009-10-30 17:03:18 -04:00
Andy McFadden
b64cc4df1a am 4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2

* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 11:03:55 -07:00
Android (Google) Code Review
b00e33d115 Merge change I08c19bee into eclair
* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 13:53:32 -04:00
Jaikumar Ganesh
2227cae49e am bf2efbc0: am 3cf254d2: Merge change I4b3db907 into eclair
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp

* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
  Revert the channge where channels were not selected randomly.
2009-10-30 10:37:46 -07:00
Jaikumar Ganesh
755e2eb3aa 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
Andy McFadden
550a11455a 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
db5fcfd064 Merge change I4b3db907 into eclair
* changes:
  Revert the channge where channels were not selected randomly.
2009-10-30 13:23:43 -04:00
Mathias Agopian
8889a8183c fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
crash was due to an unintialized variable, which caused the wrong bluring
format to be used and caused a memory overrrun.
2009-10-29 20:24:44 -07:00
Jeff Sharkey
dbfaae7bd4 am 5546e9e6: am 824838d7: Avoid NPE when callers send null selection args.
Merge commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6' into eclair-mr2-plus-aosp

* commit '5546e9e6721a5b05678ea6ceb3be433219f53fe6':
  Avoid NPE when callers send null selection args.
2009-10-29 19:59:50 -07:00
Gloria Wang
823be374cc am 9cf96280: am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1' into eclair-mr2-plus-aosp

* commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:59:33 -07:00
Mathias Agopian
661964d571 am af7d2dda: am 5dc7a21c: Merge change I4e036287 into eclair
Merge commit 'af7d2dda809be2ce43b4b892509648857f09f5e3' into eclair-mr2-plus-aosp

* commit 'af7d2dda809be2ce43b4b892509648857f09f5e3':
  update line test to expose some bug on SGX530 ed4
2009-10-29 19:59:18 -07:00
Fred Quintana
0f64935154 am 6b995479: am fae288c7: Merge change I9efe265f into eclair
Merge commit '6b9954790e6f4f48d9585dd50131d8080a086cc8' into eclair-mr2-plus-aosp

* commit '6b9954790e6f4f48d9585dd50131d8080a086cc8':
  unhide AccountManagerResponse
2009-10-29 19:59:03 -07:00
Ed Heyl
f9366bc559 am 7fb4e4aa: am 154d61fc: Merge change Id6f158b3 into eclair
Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp

* commit '7fb4e4aaf2137474a6abe0d95888e133d4075527':
  Removed javadoc link to hidden class (temporary fix for build)
2009-10-29 19:58:45 -07:00
San Mehat
b5fedad5ac am 67ef832c: am 957e5867: process: Disable debugging
Merge commit '67ef832cdba6ca5aa8c44b6eab9c4281c0a0f261' into eclair-mr2-plus-aosp

* commit '67ef832cdba6ca5aa8c44b6eab9c4281c0a0f261':
  process: Disable debugging
2009-10-29 19:58:25 -07:00
Evan Millar
86180ab2ca am 2d05af0c: am 3034624f: Merge change I26a2d829 into eclair
Merge commit '2d05af0c8aa252dc1b150395cd42f4f5cbcad392' into eclair-mr2-plus-aosp

* commit '2d05af0c8aa252dc1b150395cd42f4f5cbcad392':
  Add -P flag to ps in dumpstate
2009-10-29 19:58:08 -07:00
Costin Manolache
3db9ff0630 am 492dbe17: am 4388b988: Merge change Idc4c7714 into eclair
Merge commit '492dbe17527e27ba712d185a1eac22ae149c67c0' into eclair-mr2-plus-aosp

* commit '492dbe17527e27ba712d185a1eac22ae149c67c0':
  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:57:50 -07:00
Jason Sams
b65189d811 am e4133ec1: am ec1f1e3d: Merge change Ieab4c75b into eclair
Merge commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05' into eclair-mr2-plus-aosp

* commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
2009-10-29 19:57:33 -07:00
Jeff Hamilton
51478b2bd0 am cd79e5e1: am b5c05516: Merge change I3b7d5cbe into eclair
Merge commit 'cd79e5e173e00995f072104f7a89cf4015a90efd' into eclair-mr2-plus-aosp

* commit 'cd79e5e173e00995f072104f7a89cf4015a90efd':
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
2009-10-29 19:57:16 -07:00
San Mehat
06c2ba784a am 574b99bf: am 8e312e81: Merge change Ia5109a87 into eclair
Merge commit '574b99bfcd743d35c2d7e656ce46e282c784168e' into eclair-mr2-plus-aosp

* commit '574b99bfcd743d35c2d7e656ce46e282c784168e':
  process: Add debug code to log process group transitions
2009-10-29 19:56:58 -07:00
Jack Palevich
ea17b7c6b6 am 5be6eedf: am b575e4df: Merge change I4a943184 into eclair
Merge commit '5be6eedf3b6979679f46adfb47890005173e8caf' into eclair-mr2-plus-aosp

* commit '5be6eedf3b6979679f46adfb47890005173e8caf':
  Avoid trying to throw multiple exceptions at once.
2009-10-29 19:56:39 -07:00
Suchi Amalapurapu
48e7260b4a am a7bbedca: am 22dad592: Merge change I6cae32c7 into eclair
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp

* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
  When upgrading packages with shared user ids make sure we are eliminating
2009-10-29 19:56:20 -07:00
Scott Main
e42a4bbe62 am 56725939: am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search
Merge commit '56725939b117f7ee71e7fdaf1c8bf865d9e377ab' into eclair-mr2-plus-aosp

* commit '56725939b117f7ee71e7fdaf1c8bf865d9e377ab':
  docs: fix XSS vulnerability in search
2009-10-29 19:56:02 -07:00
Wu-cheng Li
6cad4d9615 am 16d8f10e: am 4cb04c46: Use image rect information to display zoomed picture.
Merge commit '16d8f10ebf75e809cc14d866fded7749363b9d8f' into eclair-mr2-plus-aosp

* commit '16d8f10ebf75e809cc14d866fded7749363b9d8f':
  Use image rect information to display zoomed picture.
2009-10-29 19:55:41 -07:00
Eric Fischer
14a6cdede8 am 5cecf741: am 38a9becf: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '5cecf74138ea56842463ec384ff04610c1247920' into eclair-mr2-plus-aosp

* commit '5cecf74138ea56842463ec384ff04610c1247920':
  Import revised translations.  DO NOT MERGE
2009-10-29 19:55:21 -07:00
Jeff Sharkey
a69fdb46b2 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
Gloria Wang
4ed25bc99b am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:35:16 -07:00
Mathias Agopian
e1e9073eff am 5dc7a21c: Merge change I4e036287 into eclair
Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2

* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
  update line test to expose some bug on SGX530 ed4
2009-10-29 19:34:15 -07:00
Fred Quintana
638eaee59f 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
c7d81238af 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
526dd4a430 am 957e5867: process: Disable debugging
Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
  process: Disable debugging
2009-10-29 19:32:06 -07:00
Evan Millar
0d209fe2e2 am 3034624f: Merge change I26a2d829 into eclair
Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2

* commit '3034624f68d373d7c79237425319b5b7fd84317e':
  Add -P flag to ps in dumpstate
2009-10-29 19:31:24 -07:00
Costin Manolache
4e4602c2fd 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
Jason Sams
0609b31216 am ec1f1e3d: Merge change Ieab4c75b into eclair
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2

* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
2009-10-29 19:30:11 -07:00
Jeff Hamilton
746e838b71 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
87655837e0 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
90e8e48f3f 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
2d279a3c42 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
Scott Main
8c7ba7f48d am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search
Merge commit '5eb80efb695f73c53e5a2776c485d91ae8354eff' into eclair-mr2

* commit '5eb80efb695f73c53e5a2776c485d91ae8354eff':
  docs: fix XSS vulnerability in search
2009-10-29 19:26:25 -07:00
Wu-cheng Li
78f90975bc am 4cb04c46: Use image rect information to display zoomed picture.
Merge commit '4cb04c4654e9718a73b378e7b9962dee454efa8d' into eclair-mr2

* commit '4cb04c4654e9718a73b378e7b9962dee454efa8d':
  Use image rect information to display zoomed picture.
2009-10-29 19:26:04 -07:00
Eric Fischer
8dff554721 am 38a9becf: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '38a9becfdd23e582571f624b624680cc5938d423' into eclair-mr2

* commit '38a9becfdd23e582571f624b624680cc5938d423':
  Import revised translations.  DO NOT MERGE
2009-10-29 19:23:51 -07:00
Marco Nelissen
11398d6aac am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2
Merge commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp

* commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7':
  - add javadoc for the account manager
2009-10-29 18:23:11 -07:00
Marco Nelissen
5c5fe952cb resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Mathias Agopian
df2d929405 return proper error code from eglCreateImageKHR 2009-10-29 16:45:41 -07:00
Android (Google) Code Review
a248b0f5b8 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
99cb34f244 Merge change I4e036287 into eclair
* changes:
  update line test to expose some bug on SGX530 ed4
2009-10-29 18:48:10 -04:00