Commit Graph

200 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Scott Main
06fd85fe11 Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:47:22 -07:00
Robert Greenwalt
7f0548c8ee Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:36:18 -07:00
Ramanan Rajeswaran
5eabe8272f Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:16:57 -07:00
Eric Shienbrood
84c73eef74 Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:14:07 -07:00
Yu Shan Emily Lau
beef201149 Merge branch 'readonly-p4-donut' into donut 2009-04-13 17:48:53 -07:00
Dan Bornstein
6414b70404 Merge branch 'readonly-p4-donut' into donut 2009-04-13 17:46:03 -07:00
Jack Palevich
6cbca50b6a 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.
2009-04-13 16:40:25 -07:00
Yu Shan Emily Lau
a7fa858d50 Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:09:27 -07:00
Dan Bornstein
c5273b8731 Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:06:39 -07:00
Brett Chabot
edf53b615c Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:03:16 -07:00
Android (Google) Code Review
08be29fb3e Merge change 65 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Android (Google) Code Review
b3d1c948df Merge change 64 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:00 -07:00
Android (Google) Code Review
81d108cc38 Merge change 63 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:12:27 -07:00
Lorenzo Colitti
df92bfc072 Merge branch 'readonly-p4-donut' into donut 2009-04-13 13:54:13 -07:00
Jeffrey Sharkey
7940d198ee Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:56:31 -07:00
Dianne Hackborn
fb7cab7f63 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:53:57 -07:00
Dirk Dougherty
b4f65ceb2b Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:51:20 -07:00
Andy Stadler
0be4690849 Merge branch 'readonly-p4-donut' into donut 2009-04-10 16:26:11 -07:00
Andy Stadler
bc0caf802e AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Jack Palevich
1fc1d60798 Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:47:55 -07:00
Jack Palevich
e3b21c013d Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:04:34 -07:00
Android (Google) Code Review
bb26e32154 Merge change 67 into donut
* changes:
  Integrate new power connnect/disconnect broadcasts
2009-04-09 16:21:51 -07:00
Jack Palevich
6684173667 Merge branch 'readonly-p4-donut' into donut 2009-04-09 15:01:54 -07:00
Jack Palevich
4f60b17331 Merge branch 'readonly-p4-donut' into donut 2009-04-09 14:52:42 -07:00
Eric Fischer
0448391039 Merge branch 'readonly-p4-donut' into donut 2009-04-09 14:33:58 -07:00
Dianne Hackborn
490b2ba510 AI 145382: API review: change new media keycode names to avoid ambiguity.
Updates the key maps.  During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...!  So this is now changed to match.
  BUG=1779435

Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Nick Pelly
4fea662b0f Merge branch 'readonly-p4-donut' into donut 2009-04-08 15:10:29 -07:00
Romain Guy
885d9a3fce Merge branch 'readonly-p4-donut' into donut 2009-04-08 14:23:53 -07:00
Android (Google) Code Review
ad632d282b Merge change 38 into donut
* changes:
  Fix issue #1769910 (Track activity launch times)
2009-04-08 13:42:34 -07:00
Cynthia Wong
b5ded5f81b Merge branch 'readonly-p4-donut' into donut 2009-04-07 17:25:27 -07:00
Android (Google) Code Review
24870c82c9 Merge change 37 into donut
* changes:
  Preserve an Activity's setIntent() state across relaunches
2009-04-07 16:54:26 -07:00
Jack Palevich
c893868227 AI 144282: Tweak this tool to work with the current directory structure.
Also leave the "generated" directory around if it contains files that
  need to be checked in.

Automated import of CL 144282
2009-04-02 13:38:26 -07:00
Nick Pelly
819aa237a5 AI 144151: am: CL 144150 Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  Original author: npelly
  Merged from: //branches/cupcake/...

Automated import of CL 144151
2009-04-02 01:21:13 -07:00