84 Commits

Author SHA1 Message Date
Android (Google) Code Review
22a262f09d am 5e1d8ae: Merge change 1355 into donut
Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'

* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:37:20 -07:00
Mike Lockwood
e3635c9693 GPS: Generalize SUPL support to include AGPS for CDMA
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-11 11:02:45 -04:00
Mathias Agopian
5af95aa20b am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "
Merge commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24'

* commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24':
  remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h
2009-05-08 22:51:20 -07:00
Mathias Agopian
8331f72078 remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h 2009-05-08 17:18:55 -07:00
Android (Google) Code Review
3cf650dec4 am 672f1e2: Merge change 1192 into donut
Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'

* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 12:25:06 -07:00
Android (Google) Code Review
672f1e2b07 Merge change 1192 into donut
* changes:
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 11:41:47 -07:00
The Android Open Source Project
59e3c94860 am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'

* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
  Require native-order direct buffers for glXXXPointer APIs.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
c11dbe782d am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'

* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
  Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
1a36071092 manual merge of 7ec32cc
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
Jack Palevich
e20ea783a1 Require native-order direct buffers for glXXXPointer APIs.
This was always a documented restriction, but was not enforced by the runtime until now.

Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.

Now we throw an exception rather than leaving the system in a potentially bad state.
2009-05-07 18:28:29 -07:00
Android (Google) Code Review
2108e5c74f Merge change 1163 into donut
* changes:
  Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
Joe Onorato
b1a7ffef3a More backup tests 2009-05-07 15:32:48 -07:00
Robert Greenwalt
704e00ab7b Fix 1825581 - device restarts when using A2DP.
Had to do with using the wrong JNIEnv.  Now storing the VM and looking up a
JNIEnv appropriate to the thread as needed.
2009-05-07 14:09:29 -07:00
Jack Palevich
be509c9c7d Fix automatically generated code for glGet
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
2009-05-07 10:52:18 -07:00
Wu-cheng Li
1e38d86034 am fa3e556: Change error message.
Merge commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5'

* commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5':
  Change error message.
2009-05-04 13:27:00 -07:00
Wu-cheng Li
fa3e556279 Change error message. 2009-05-04 19:38:43 +08:00
Android (Google) Code Review
3bc15fcfdc am e5c4725: Merge change 873 into donut
Merge commit 'e5c4725666da25138193bed83831b66b9c0b2c45'

* commit 'e5c4725666da25138193bed83831b66b9c0b2c45':
  pass original ptrs to JNI release functions (instead of += index to them)
2009-05-01 07:59:31 -07:00
Mike Reed
ad8b8f57a4 pass original ptrs to JNI release functions (instead of += index to them) 2009-05-01 08:24:01 -04:00
Mike Lockwood
245eb108d5 am c21a08f: gps: Fix missing return value in android_location_GpsLocatio
Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'

* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
  gps: Fix missing return value in android_location_GpsLocationProvider_init
2009-04-30 12:34:13 -07:00
Mike Lockwood
c21a08f747 gps: Fix missing return value in android_location_GpsLocationProvider_init
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-30 15:17:49 -04:00
Android (Google) Code Review
a5a51e1724 am 77c9990: Merge change 599 into donut
Merge commit '77c9990ae0806575ae7a2750459f3e74f0bec092'

* commit '77c9990ae0806575ae7a2750459f3e74f0bec092':
  Add call to (new) Canvas.freeCaches() in response to low-memory
2009-04-29 13:35:35 -07:00
Android (Google) Code Review
070d4c023a am 3de05ff: Merge change 586 into donut
Merge commit '3de05ffb910b572f7816b838628567c760540f7d'

* commit '3de05ffb910b572f7816b838628567c760540f7d':
  Manage imagecache ram budget
2009-04-29 13:35:33 -07:00
Android (Google) Code Review
d1d2af6846 am 3eab744: Merge change 376 into donut
Merge commit '3eab744d018924189b1b8f5530accd52e91213de'

* commit '3eab744d018924189b1b8f5530accd52e91213de':
  Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
2009-04-29 13:35:29 -07:00
Android (Google) Code Review
cb49634c73 am 1fb758e: Merge change 546 into donut
Merge commit '1fb758e94b5b9e342b6dc6452cb5bd7cf0cc4ed6'

* commit '1fb758e94b5b9e342b6dc6452cb5bd7cf0cc4ed6':
  Add (hidden for now) purgeable bitmaps
2009-04-29 13:35:29 -07:00
Android (Google) Code Review
772a767086 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
77c9990ae0 Merge change 599 into donut
* changes:
  Add call to (new) Canvas.freeCaches() in response to low-memory
2009-04-28 12:28:47 -07:00
Android (Google) Code Review
3de05ffb91 Merge change 586 into donut
* changes:
  Manage imagecache ram budget
2009-04-28 05:17:41 -07:00
Mike Reed
caf0df1b7f Add call to (new) Canvas.freeCaches() in response to low-memory
This is in conjunction with removing a similar call made by the browser.
Now it will be centralized, and the browser's call site will be removed.
2009-04-27 14:32:05 -04:00
Android (Google) Code Review
3eab744d01 Merge change 376 into donut
* changes:
  Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
2009-04-27 09:18:14 -07:00
San Mehat
e9d376b801 Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
Signed-off-by: San Mehat <san@google.com>
2009-04-27 09:17:06 -07:00
Mike Reed
fc8db53eee Manage imagecache ram budget
This code was lifted from the browser, and is now global since java clients may
also use this cache for decoded images
2009-04-27 11:43:30 -04:00
Android (Google) Code Review
1fb758e94b Merge change 546 into donut
* changes:
  Add (hidden for now) purgeable bitmaps
2009-04-27 05:31:19 -07:00
Mike Reed
c70e06bbfa Add (hidden for now) purgeable bitmaps
BitmapFactory::Options now let you specify if the resulting bitmap can be
"purgeable". If so, then its decoded pixels may be purged when not actively
being drawn, freeing up that RAM. When such a bitmap is drawn, it will
automatically be re-decoded on demand. This is done by having the bitmap
keep a reference/copy of the encoded data.

Where it is a reference or a copy is controlled by the "shareable" flag in
Options. If this is true, the implementation *may* just reference the encode
data (e.g. a file descriptor) rathern than making a complete copy of it.

Currently, purgeable is not supported for generic inputstreams, but is
enabled for byte-array, file-descriptor, and assets, though for impl
reasons only file-descripts are currently enabled for "shareable", but that
may change in the future.
2009-04-24 17:20:29 -04:00
Jack Palevich
a379585e6e 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
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Evan Millar
ac9fd3e423 Merge branch 'readonly-p4-master' 2009-04-18 23:36:20 -07:00
Evan Millar
74e258d63e AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar

Automated import of CL 146854
2009-04-18 23:35:03 -07:00
Evan Millar
4482d8c8e4 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Evan Millar
c64edde69d AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458

Automated import of CL 146853
2009-04-18 12:26:32 -07:00
Jack Palevich
1c4907ee77 Manually merge 129, 174, and 233 from donut
This adds a static OpenGL ES API.

Here are the three commit messages for the original changes:

Clean up trivial Eclipse warnings and fix whitespace.

Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.

This is the 2nd commit message:

Improve glgen

+ gen script is really a bash script rather than a sh script,
  so declare that to be true. (For example, it uses pushd,
  which is a part of bash, but not a part of sh. Not sure
  how this worked until now. Possibly gen was only run in
  environments where /bin/sh was really bash.

+ Check the results of the java compile of the code generator,
  and abort the script if the compile fails.

+ Turn on the bash shell option that guards against using
  uninitialized variables in the script.

+ Remove the generated class files.

Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.

This is the 3rd commit message:

Add an Android-specific static OpenGL ES 1.1 Java API.

This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-17 10:32:56 -07:00
Jack Palevich
27f8002e59 Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-16 15:20:55 -07:00
Mike Lockwood
58bda98766 gps: Add support for bringing up a GSM data connection on demand for SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 16:25:07 -04:00
Lorenzo Colitti
d86e6ddfc1 AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets.
Original author: lorenzo

Automated import of CL 146166
2009-04-14 12:08:54 -07:00
Lorenzo Colitti
e8624dd69d AI 145920: Don't filter out IPv6 multicast packets.
Automated import of CL 145920
2009-04-13 13:52:55 -07:00
Andy McFadden
e2b23e11a5 AI 144469: Added test for dalvik.vm.check-dex-sum property.
Enables -Xcheckdexsum argument, which causes the VM to test checksums
  when loading optimized DEX files.
  BUG=1749836

Automated import of CL 144469
2009-04-03 11:09:46 -07:00
Robert Greenwalt
28d139fa95 AI 144392: am: CL 144241 Stop polling dbus.
Original author: rgreenwalt

Automated import of CL 144392
2009-04-02 22:41:08 -07:00
Ray Chen
43ca00b0e8 AI 144209: am: CL 144176 To fix the race condition in case "requestCancelDecode"
happens earlier than AutoDecoderCancel object is added
  to the gAutoDecoderCancelMutex linked list.
  Original author: raychen
  Merged from: //branches/donutburger/...

Automated import of CL 144209
2009-04-02 10:41:55 -07:00
Jack Palevich
84d8d693bd AI 144129: Remove hidden class android.os.Exec.
Change BugReportService to use java.os.ProcessBuilder instead.
  Remove unused import from DumpStateReceiver.
  An earlier change list created a private copy of this class for Term.
  BUG=1750582

Automated import of CL 144129
2009-04-02 10:09:47 -07:00
Robert Greenwalt
d30b2568cd AI 144241: Stop polling dbus.
BUG=1244263

Automated import of CL 144241
2009-04-02 09:53:35 -07:00
Mike Reed
8ba88775fe AI 144018: change path to return its internal cached bounds, making it much lighter-weight to get the bounds.
BUG=1748928

Automated import of CL 144018
2009-04-02 09:06:19 -07:00