Commit Graph

5071 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
fbe69961ba Merge donut into master 2009-04-22 18:33:17 -07:00
Jean-Baptiste Queru
8e0bf89cc0 Merge donut into master 2009-04-22 18:27:14 -07:00
Jean-Baptiste Queru
f6ead370b6 merge cupcake into donut 2009-04-22 17:56:58 -07:00
Jean-Baptiste Queru
2bcce3696e Merge donut into master 2009-04-22 17:12:34 -07:00
Android (Google) Code Review
cec419a3ea Merge change 289 into donut
* changes:
  Changes for new ril.h.
2009-04-22 16:44:52 -07:00
Robert Greenwalt
fd392958ea Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date:   Wed Apr 22 14:31:26 2009 -0700

    Additional fixes and tests for density.

commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date:   Tue Apr 14 14:39:00 2009 -0700

    Fix runtime resource selection logic.

    Fix isBetterThan so that o or this may be supperior at any stage.
    Used to only handle this-better or tie at each stage, biasing against o.
    Also allows reset of unit test to succeed.  Fixes bug 1709202.
2009-04-22 14:35:11 -07:00
Dirk Dougherty
91a6780885 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:39:58 -07:00
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
Dirk Dougherty
37cb461e21 Merge branch 'readonly-p4-master' 2009-04-22 01:08:00 -07:00
Dirk Dougherty
b6f96a25e0 Merge branch 'readonly-p4-master' 2009-04-22 01:05:08 -07:00
Scott Main
08e1a554ab Merge branch 'readonly-p4-master' 2009-04-22 01:02:14 -07:00
Scott Main
567ad3235a Merge branch 'readonly-p4-master' 2009-04-22 00:56:26 -07:00
Scott Main
f43a286257 Merge branch 'readonly-p4-master' 2009-04-22 00:53:37 -07:00
Scott Main
2e972031c3 Merge branch 'readonly-p4-master' 2009-04-22 00:50:50 -07:00
Dirk Dougherty
880ce8cde8 Merge branch 'readonly-p4-master' 2009-04-22 00:47:58 -07: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
Xavier Ducrohet
03236a7c04 Merge branch 'readonly-p4-master' 2009-04-21 18:48:41 -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
38c11d2261 Merge branch 'readonly-p4-master' 2009-04-21 15:17:40 -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
63674de250 Merge branch 'readonly-p4-master' 2009-04-21 15:04:33 -07:00
Dirk Dougherty
2dc2e7197d Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:01:57 -07:00
Dirk Dougherty
fba25a82e3 Merge branch 'readonly-p4-master' 2009-04-21 14:57:48 -07:00