Commit Graph

802 Commits

Author SHA1 Message Date
Dirk Dougherty
4bac020665 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:37:15 -07:00
Scott Main
be190010d4 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:34:31 -07:00
Scott Main
df31ba7f4c Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:28:57 -07:00
Scott Main
cbf04d75e8 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:26:11 -07:00
Scott Main
883cb2dd99 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:23:29 -07:00
Dirk Dougherty
e1b7dd2c8c Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:20:44 -07:00
Jean-Baptiste Queru
6141ec0536 Merge commit 'goog/readonly-p4-donut' into HEAD
Conflicts:
	location/java/android/location/Geocoder.java
2009-04-22 12:09:59 -07:00
Android (Google) Code Review
cd77dffe55 Merge change 358 into donut
* changes:
  Fix issue 1745312: Various cleanups in media framework
2009-04-22 09:57:03 -07:00
Android (Google) Code Review
c8d3410981 Merge change 416 into donut
* changes:
  Remove debug messages. 	modified:   core/java/android/hardware/Camera.java
2009-04-22 01:59:31 -07:00
Wu-cheng Li
81d763f77a Remove debug messages.
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00
Android (Google) Code Review
bd737ca301 Merge change 404 into donut
* changes:
  normalize the DATA_STATE_RADIO_OFF event log id definition
2009-04-21 23:44:04 -07:00
Android (Google) Code Review
dc50547df9 Merge change 403 into donut
* changes:
  remove superfluous lines
2009-04-21 23:43:45 -07:00
Android (Google) Code Review
35e5ee4e97 Merge change 387 into donut
* changes:
  Geocoder: Document behavior when no backend service is available.
2009-04-21 17:31:01 -07:00
Jeff Hamilton
6b225a92cc Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Android (Google) Code Review
5b0689a8b1 Merge change 372 into donut
* changes:
  WifiService: Cleanup parsing of wifi scan results.
2009-04-21 15:12:25 -07:00
Dirk Dougherty
2dc2e7197d Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:01:57 -07:00
Dirk Dougherty
915df02d41 Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:55:49 -07:00
Scott Main
98c5a2daec Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:28:13 -07:00
Dirk Dougherty
0bfa1bf0c6 Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:15:40 -07:00
Android (Google) Code Review
e2ac5fddd8 Merge change 352 into donut
* changes:
  Remove dangling media recorder client reference when setCamera() is used.
2009-04-21 13:20:07 -07:00
Android (Google) Code Review
7e6a65edbb Merge change 368 into donut
* changes:
  location: Add some null pointer checks.
2009-04-21 12:44:57 -07:00
Andy Stadler
55cf040e52 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:56:08 -07:00
Andy Stadler
09acf6e6c7 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:53:07 -07:00
Android (Google) Code Review
3912875a1c Merge change 360 into donut
* changes:
  location: Location Manager wakelock cleanup, phase 1
2009-04-21 09:40:38 -07:00
Android (Google) Code Review
f22aa61a51 Merge change 336 into donut
* changes:
  Ensure ongoing progress updates after using the scroll ball to adjust position.
2009-04-21 08:18:50 -07:00
Eric Laurent
4dd495b72c Fix issue 1745312: Various cleanups in media framework
AudioTrack, AudioRecord:
  - remove useless mAudioFlinger member of AudioTrack and AudioRecord.
  - signal cblk.cv condition in stop() method to speed up stop completion.
  - extend wait condition timeout in obtainBuffer() when waitCount is -1 to avoid waking up callback thread unnecessarily

AudioFlinger:
  - remove some warnings in AudioFlinger.cpp.
  - remove function AudioFlinger::MixerThread::removetrack_l()  as its content is never executed.
  - remove useless call to setMasterVolume in AudioFlinger::handleForcedSpeakerRoute().
  - Offset VOICE_CALL stream volume to reflect actual volume that is never 0 in hardware (this fix has been made in the open source): 0.01 + v * 0.99.

AudioSystem.java:
  - correct typo in comment

IAudioflinger, IAudioFlingerClient:
  - make AudioFlinger binder interfaces used for callbacks ONEWAY.

AudioHardwareInterface:
  - correct routeStrings[] table in AudioHardwareInteface.cpp
2009-04-21 07:56:33 -07:00
Dirk Dougherty
2d06d8af61 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:06:57 -07:00
Dirk Dougherty
2d8d226165 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:28 -07:00
James Dong
0ae13e36e1 Remove dangling media recorder client reference when setCamera() is used. 2009-04-20 19:35:28 -07:00
Jean-Michel Trivi
ecb28b3021 Merge branch 'readonly-p4-donut' into donut 2009-04-20 16:31:35 -07:00
Jean-Michel Trivi
f1542eacc0 Merge branch 'readonly-p4-donut' into donut 2009-04-20 10:47:31 -07:00
Dmitry Shmidt
2ad33d01a9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 09:50:17 -07:00
Evan Millar
287657b079 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Android (Google) Code Review
3e8a53e769 Merge change 287 into donut
* changes:
  Get Sketch compiling.
2009-04-17 16:24:12 -07:00
Android (Google) Code Review
9b187e977a Merge change 279 into donut
* changes:
  Add sketch gesture demo application.
2009-04-17 14:20:38 -07:00
Android (Google) Code Review
4573f5982d Merge change 263 into donut
* changes:
  location: Generalize support for location provider usage tracking.
2009-04-17 14:05:57 -07:00
Dave Sparks
b083de35b8 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:49:44 -07:00
Jean-Michel Trivi
823b984ed9 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:46:50 -07:00
Urs Grob
14bbab5616 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:31:36 -07:00
Dave Sparks
0eb6d6e33d Merge branch 'readonly-p4-donut' into donut 2009-04-16 19:55:31 -07:00
Android (Google) Code Review
cb19163660 Merge change 233 into donut
* changes:
  Add an Android-specific static OpenGL ES 1.1 Java API.
2009-04-16 17:55:44 -07:00
Dave Sparks
658c6a1347 Merge branch 'readonly-p4-donut' into donut 2009-04-16 17:51:48 -07:00
Jack Palevich
427f585f72 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
Brandon Ballinger
db3095c118 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Dirk Dougherty
1ce38018f9 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:29:31 -07:00
Dirk Dougherty
73bca2e954 Merge branch 'readonly-p4-donut' into donut 2009-04-16 13:35:30 -07:00
Xavier Ducrohet
9a4ec0a034 Merge branch 'readonly-p4-donut' into donut 2009-04-16 12:45:54 -07:00
Android (Google) Code Review
753b1c74e9 Merge change 187 into donut
* changes:
  replaced integer * and % with shift operations, for performance
2009-04-16 00:05:57 -07:00
Android (Google) Code Review
f6a56f6813 Merge change 186 into donut
* changes:
  eliminate seemingly pointless conversion to and then from hex string
2009-04-15 12:13:07 -07:00
Dirk Dougherty
9a081ce2ca Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:35:03 -07:00