Commit Graph

387 Commits

Author SHA1 Message Date
Android (Google) Code Review
aa9db7ada0 am 01be1fa: Merge change 572 into donut
Merge commit '01be1fa7930e92aac6ba4dd4e8cb75f8719e8b37'

* commit '01be1fa7930e92aac6ba4dd4e8cb75f8719e8b37':
  oops forgot to remove a LOGD when loading an opengl driver
2009-04-29 13:35:28 -07:00
Android (Google) Code Review
7eaa5c6919 am fd9b3c0: Merge change 570 into donut
Merge commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc'

* commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc':
  Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
2009-04-29 13:35:28 -07:00
Android (Google) Code Review
e503557c2b am f73eaf9: Merge change 531 into donut
Merge commit 'f73eaf92e561eb0a010d05cc6357e172e8c9eaf7'

* commit 'f73eaf92e561eb0a010d05cc6357e172e8c9eaf7':
  Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
2009-04-29 13:35:28 -07:00
Android (Google) Code Review
cfc14993d2 am 9e8ca9a: Merge change 551 into donut
Merge commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a'

* commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a':
  Enable static Java APIs for OpenGL ES 1.1 extensions.
2009-04-29 13:35:24 -07:00
Android (Google) Code Review
2919d235b2 am affb4e7: Merge change 534 into donut
Merge commit 'affb4e7694a4184d257d0ac71e3119e015b558e2'

* commit 'affb4e7694a4184d257d0ac71e3119e015b558e2':
  Make sure to map undefined OES functions to their non-OES counterpart if it exists.
2009-04-29 13:35:24 -07:00
Android (Google) Code Review
2e0032960a am 8cac906: Merge change 528 into donut
Merge commit '8cac9064f5e4863f62d59560cbe9a54a61ba4a9a'

* commit '8cac9064f5e4863f62d59560cbe9a54a61ba4a9a':
  Send the path of the EF file for ICC IO
2009-04-29 13:35:24 -07:00
Android (Google) Code Review
9cf974d286 am ba2eba4: Merge change 539 into donut
Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d'

* commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d':
  Modify and turn on the test case for video recording in portrait mode.
2009-04-29 13:35:24 -07:00
Bjorn Bringert
201165b65b am 7fc4b28: Merge branch \'readonly-p4-donut\' into donut
Merge commit '7fc4b281750be2442a327e7aa9fb03c44096caf3'

* commit '7fc4b281750be2442a327e7aa9fb03c44096caf3':
  AI 147681: Fix SearchDialog crash on missing FORMAT suggestion column.
2009-04-29 13:35:23 -07:00
Android (Google) Code Review
1e0ab1abbf am 96a98d6: Merge change 402 into donut
Merge commit '96a98d61d7a8360e7a70c91281a9d608837a6056'

* commit '96a98d61d7a8360e7a70c91281a9d608837a6056':
  remove seemingly now unnecessary workaround path
2009-04-29 13:35:23 -07:00
Android (Google) Code Review
232abc2a24 am dcac00d: Merge change 415 into donut
Merge commit 'dcac00d4d2f656887d2b48d0f314e6cf56b7c68b'

* commit 'dcac00d4d2f656887d2b48d0f314e6cf56b7c68b':
  code cleanup
2009-04-29 13:35:23 -07:00
Android (Google) Code Review
1b9cd20867 am 5fa1533: Merge change 482 into donut
Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5'

* commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5':
  location: Location Manager wakelock cleanup, phase 2
2009-04-29 13:35:22 -07:00
Android (Google) Code Review
2e835dfcea am d6f9b9b: Merge change 529 into donut
Merge commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2'

* commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2':
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
2009-04-29 13:35:22 -07:00
The Android Open Source Project
a878c3f73e am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut 2009-04-29 13:34:51 -07:00
Android (Google) Code Review
abbab9ba2f am 0a9b5bb: Merge change 509 into donut
Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742'

* commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742':
  Fix a media server crash (bug 1807910): part one
2009-04-29 13:11:33 -07:00
Android (Google) Code Review
d1ae69b571 am 5616a7d: Merge change 459 into donut
Merge commit '5616a7d1dea1aecc8353bab144d14446aa33391a'

* commit '5616a7d1dea1aecc8353bab144d14446aa33391a':
  TypedProperties: initial commit
2009-04-29 13:11:33 -07:00
Android (Google) Code Review
0ed290dbef am 24b62d0: Merge change 462 into donut
Merge commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a'

* commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a':
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
2009-04-29 13:11:32 -07:00
Android (Google) Code Review
e54a9e05f9 am 9c56513: Merge change 165 into donut
Merge commit '9c5651390056cd9c2f68d5df057739528bd4128b'

* commit '9c5651390056cd9c2f68d5df057739528bd4128b':
  Squashed commit of the following:
2009-04-29 13:11:32 -07:00
Android (Google) Code Review
58685aad1d am 947fe79: Merge change 483 into donut
Merge commit '947fe79e99d5536a10c5b81946d20e69d0e9d479'

* commit '947fe79e99d5536a10c5b81946d20e69d0e9d479':
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-29 13:11:28 -07:00
Tammo Spalink
4e8527551a am 0a57e5b: removed extra event log tag
Merge commit '0a57e5b730beaea75c1c1b1ca51b40c463918b4d'

* commit '0a57e5b730beaea75c1c1b1ca51b40c463918b4d':
  removed extra event log tag
2009-04-29 13:11:28 -07:00
Android (Google) Code Review
6217cfeb4a am 0b8ffd1: Merge change 460 into donut
Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82'

* commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82':
  More optimization of dumpsys output.
2009-04-29 13:11:27 -07:00
Android (Google) Code Review
3d58667146 Merge change 331
* changes:
  Add option for gtalk stream compression
2009-04-28 15:36:33 -07:00
Android (Google) Code Review
d2370229ba Merge change 611
* changes:
  change the IsolatedContext to have a test version of the AccountManager that has no IBinder to the AccountManagerService.
2009-04-28 10:56:48 -07:00
Android (Google) Code Review
b786783b91 Merge change 605
* changes:
  Add '_' to the allowable characters in a host name.
2009-04-28 04:56:52 -07:00
Android (Google) Code Review
8776477b2c Merge change 572 into donut
* changes:
  oops forgot to remove a LOGD when loading an opengl driver
2009-04-24 18:18:19 -07:00
Mathias Agopian
3d8817935b oops forgot to remove a LOGD when loading an opengl driver 2009-04-24 18:16:44 -07:00
Android (Google) Code Review
378092dc1b Merge change 570 into donut
* changes:
  Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
2009-04-24 17:59:34 -07:00
Android (Google) Code Review
1a3a85145a Merge change 531 into donut
* changes:
  Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
2009-04-24 17:14:50 -07:00
Android (Google) Code Review
4e8bdce13f Merge change 551 into donut
* changes:
  Enable static Java APIs for OpenGL ES 1.1 extensions.
2009-04-24 14:17:01 -07:00
Android (Google) Code Review
4172e40633 Merge change 534 into donut
* changes:
  Make sure to map undefined OES functions to their non-OES counterpart if it exists.
2009-04-24 13:09:06 -07:00
Jack Palevich
3327d6c5ac Enable static Java APIs for OpenGL ES 1.1 extensions.
This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs
up to. Now there are C APIs, so we can call them.

Of course, whether or not the C APIs actually work when you call them depend upon the
capabilities of the active OpenGL driver, which must be checked at run time.

Also, while we're here, make the glGetString method static. It was always supposed to be static,
but was accidentally implemented as non-static, because the code was copied from the non-static
OpenGL ES classes.
2009-04-24 13:07:17 -07:00
Android (Google) Code Review
4ade629003 Merge change 497
* changes:
  change the sync framework and users to understand Account
2009-04-24 12:23:57 -07:00
Android (Google) Code Review
9840375354 Merge change 528 into donut
* changes:
  Send the path of the EF file for ICC IO
2009-04-24 12:01:56 -07:00
Android (Google) Code Review
dc63d95576 Merge change 539 into donut
* changes:
  Modify and turn on the test case for video recording in portrait mode.
2009-04-24 11:08:18 -07:00
Bjorn Bringert
fee335512d Merge branch 'readonly-p4-donut' into donut 2009-04-24 02:59:00 -07:00
Android (Google) Code Review
3454eebbc0 Merge change 402 into donut
* changes:
  remove seemingly now unnecessary workaround path
2009-04-24 00:55:26 -07:00
Android (Google) Code Review
46f6e5bbe7 Merge change 415 into donut
* changes:
  code cleanup
2009-04-24 00:39:44 -07:00
Android (Google) Code Review
197502fe6e Merge change 482 into donut
* changes:
  location: Location Manager wakelock cleanup, phase 2
2009-04-23 22:44:05 -07:00
Android (Google) Code Review
e537c8e7a7 Merge change 529 into donut
* changes:
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
2009-04-23 19:59:17 -07:00
Mathias Agopian
1c2be6af86 Make sure to map undefined OES functions to their non-OES counterpart if it exists. 2009-04-23 19:57:10 -07:00
Karl Rosaen
6912c705b5 Merge branch 'readonly-p4-donut' into donut 2009-04-23 19:01:36 -07:00
Mathias Agopian
b519abb606 use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis. 2009-04-23 18:05:44 -07:00
Android (Google) Code Review
972d985b7f Merge change 509 into donut
* changes:
  Fix a media server crash (bug 1807910): part one Add a factory method that creates a Camera object from a remote client
2009-04-23 15:58:38 -07:00
Android (Google) Code Review
e0c499153b Merge change 459 into donut
* changes:
  TypedProperties: initial commit
2009-04-23 14:22:58 -07:00
James Dong
f1a5314076 Fix a media server crash (bug 1807910): part one
Add a factory method that creates a Camera object from a remote client

Next:
The changes in authordriver.cpp and android_camera_input.cpp will come.
and the constructor for Camera object will be removed.
2009-04-23 14:07:23 -07:00
Android (Google) Code Review
e1e08acf41 Merge change 462 into donut
* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
2009-04-23 13:48:39 -07:00
Mathias Agopian
53238bddea integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK. 2009-04-23 13:45:48 -07:00
Android (Google) Code Review
5390ff2efc Merge change 165 into donut
* changes:
  Squashed commit of the following:
2009-04-23 12:23:46 -07:00
Android (Google) Code Review
b0f249fefd Merge change 483 into donut
* changes:
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-23 11:44:10 -07:00
Android (Google) Code Review
be970a91b1 Merge change 431
* changes:
  package run_page_cycler.py into apk and add code for extraction
2009-04-22 18:51:09 -07:00
Android (Google) Code Review
7f9857743d Merge change 460 into donut
* changes:
  More optimization of dumpsys output.
2009-04-22 18:33:57 -07:00