Xavier Ducrohet
9a4ec0a034
Merge branch 'readonly-p4-donut' into donut
2009-04-16 12:45:54 -07:00
Ramanan Rajeswaran
3628d1d00d
Merge branch 'readonly-p4-master'
2009-04-16 12:42:17 -07:00
Mathias Agopian
62b74444be
fix a few typos in comments. this is really intended as a git pull/push test.
2009-04-16 12:29:34 -07:00
Mathias Agopian
40b7f6e043
fix some issues with Surface's lifetime management.
...
To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
2009-04-16 12:29:34 -07:00
Scott Main
19caa910f3
Merge branch 'readonly-p4-master'
2009-04-16 11:43:01 -07:00
Android (Google) Code Review
afac476f5b
Merge changes 222,223,227
...
* changes:
update onCreate method to work around InstrumentationTestRunner limitation.
Removing unused StreamPipe class, also stripping some white spaces
* Update the way that run_page_cycler.py detectes instrumentation failures. * Use Debug.getMemoryInfo to collect memory information in LoadTestAutoTest.
2009-04-16 11:12:33 -07:00
Android (Google) Code Review
4f33a4c871
Merge change 219
...
* changes:
Fix a null pointer exception in DumpRenderTree (issue 1792567)
2009-04-16 11:11:14 -07:00
Robert Greenwalt
fd25425797
Merge branch 'readonly-p4-master'
2009-04-16 11:07:25 -07:00
Ramanan Rajeswaran
225b75ca30
Merge branch 'readonly-p4-master'
2009-04-16 10:49:44 -07:00
Android (Google) Code Review
5c6e70f655
Merge change 195
...
* changes:
Make webkit's cursor draw at the correct times.
2009-04-16 06:21:10 -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
Mathias Agopian
4243e66621
fix a rookie mistake causing Singleton<> to be a "multiton". Also improve the BufferMapper's debugging, but turn it off.
...
Squashed commit of the following:
commit 04e9cae7f806bd65f2cfe35c011b47a36773bbe5
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 18:30:30 2009 -0700
fix and improve BufferMapper's tracking of mapped buffers.
commit 1a8deaed15811092b2349cc3c40cafb5f722046c
Author: Mathias Agopian <mathias@google.com>
Date: Wed Apr 15 00:52:02 2009 -0700
fix some bugs with the Singleton<> class. untested.
commit ed01cc06ad70cf640ce1258f01189cb1a96fd3a8
Author: Mathias Agopian <mathias@google.com>
Date: Tue Apr 14 19:29:25 2009 -0700
some work to debug the Singleton<> template.
2009-04-15 18:34:24 -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
Dirk Dougherty
72362b79bc
Merge branch 'readonly-p4-donut' into donut
2009-04-15 11:32:07 -07:00
Android (Google) Code Review
f6aed0365c
Merge change 190 into donut
...
* changes:
location: Move geocoding support from ILocationProvider to a new interface.
2009-04-15 08:21:40 -07:00
Eric Shienbrood
af43695f97
Merge branch 'readonly-p4-master'
2009-04-15 06:59:53 -07:00
Android (Google) Code Review
f32a863262
Merge change 174 into donut
...
* changes:
Improve glgen
2009-04-15 06:14:11 -07:00
Android (Google) Code Review
65943af798
Merge change 175 into donut
...
* changes:
telephony: Don't disable an APN type that is not enabled.
2009-04-14 20:19:42 -07:00
Jack Palevich
ffac1eff58
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.
2009-04-14 19:00:09 -07:00
The Android Open Source Project
106f3a4aed
Merge commit 'korg/cupcake'
2009-04-14 18:18:15 -07:00
The Android Open Source Project
23525ac2a3
Merge commit 'korg/cupcake'
2009-04-14 18:18:03 -07:00
Scott Main
5eb4852639
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:23:06 -07:00
Scott Main
151414fed9
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:02:10 -07:00
Guang Zhu
1c7ce8787d
Merge branch 'readonly-p4-donut' into donut
2009-04-14 16:47:03 -07:00
Eric Shienbrood
240a001160
Merge branch 'readonly-p4-master'
2009-04-14 15:41:38 -07:00
Mathias Agopian
4cf74ac30a
Merge commit 'goog/master' into merge_master
2009-04-14 15:21:33 -07:00
Mathias Agopian
0a2b2b905f
Merge commit 'goog/master_gl' into merge_master
2009-04-14 14:56:34 -07:00
Mathias Agopian
83d184a299
Merge commit 'goog/master' into merge_master
2009-04-14 14:45:37 -07:00
Android (Google) Code Review
6f6fcc2afa
Merge changes 108,130,131 into donut
...
* changes:
util/DebugUtils: Remove references to android.util.Config
text: Remove references to android.util.Config
Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
3cc9a57fe9
Merge change 109 into donut
...
* changes:
Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Yu Shan Emily Lau
7b624ffa05
Merge branch 'readonly-p4-master'
2009-04-14 14:33:23 -07:00
Android (Google) Code Review
4dc58eb1b7
Merge change 129 into donut
...
* changes:
Clean up trivial Eclipse warnings and fix whitespace.
2009-04-14 14:15:22 -07:00
Android (Google) Code Review
aa913f65ce
Merge change 154 into donut
...
* changes:
gps: Add support for bringing up a GSM data connection on demand for SUPL.
2009-04-14 13:36:33 -07:00
Android (Google) Code Review
609901a028
Merge change 133 into donut
...
* changes:
Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Android (Google) Code Review
8c7acbe3e4
Merge change 132 into donut
...
* changes:
Let's do bug #1769910 actually right.
2009-04-14 13:15:43 -07:00
Android (Google) Code Review
3fcff1d7a4
Merge change 142 into donut
...
* changes:
telephony: Add support for bringing up GSM data connections for GPS SUPL.
2009-04-14 12:52:28 -07:00
Dan Bornstein
a2aef005fc
Merge branch 'readonly-p4-master'
2009-04-14 12:42:22 -07:00
Brett Chabot
7d6daac1a1
Merge branch 'readonly-p4-master'
2009-04-14 12:39:37 -07:00
Lorenzo Colitti
4680ab625f
Merge branch 'readonly-p4-master'
2009-04-14 12:10:26 -07:00
Leon Scroggins
56eccb2855
Merge commit 'goog/master'
2009-04-14 12:06:19 -07:00
Android (Google) Code Review
11b61b471f
Merge change 79
...
* changes:
Squashed commit of the following:
2009-04-14 11:54:14 -07:00
Leon Scroggins
b52d5323ea
Merge branch 'readonly-p4-master'
2009-04-14 11:07:14 -07:00
Ramanan Rajeswaran
34dd8b0422
Merge branch 'readonly-p4-donut' into donut
2009-04-14 11:07:13 -07:00
Ramanan Rajeswaran
f903a0e151
Merge branch 'readonly-p4-donut' into donut
2009-04-14 09:48:58 -07:00
Ramanan Rajeswaran
e86ac7cf26
Merge branch 'readonly-p4-donut' into donut
2009-04-14 09:34:58 -07:00
Jack Palevich
8f75e091d9
Add clarifying comment.
...
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Android (Google) Code Review
519e83f566
Merge change 105 into donut
...
* changes:
Fix crash when mSST is null and change default to GSM.
2009-04-13 21:37:13 -07:00
Jack Palevich
08a305b8f7
Merge commit 'goog/master' into HEAD
2009-04-13 19:52:45 -07:00
Scott Main
06fd85fe11
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:47:22 -07:00