694 Commits

Author SHA1 Message Date
Jason Sams
5f7fc27dce Replace spins with proper pthread conditions. 2009-06-18 16:58:42 -07:00
Android (Google) Code Review
e9c1970bbf am b1cdb648: Merge change 4565 into donut
Merge commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982'

* commit 'b1cdb64877ebd3b8c5182913ff02edd8b54a6982':
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:43:28 -07:00
Android (Google) Code Review
b1cdb64877 Merge change 4565 into donut
* changes:
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
2009-06-18 15:41:34 -07:00
David 'Digit' Turner
2a578ae518 Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density
ro.sf.lcd_density is usually defined in the build.prop file which is parsed by init
before anything else. Since its name begins with "ro.", this property is write-once
and cannot later be modified, e.g. in /system/etc/init.goldfish.sh.

In other words, you cannot use "emulator -prop ro.sf.lcd_density=<value>", since
it is impossible to override the value defined in build.prop

This patch modifies the system to recognize "qemu.sf.lcd_density" as an override
value, which can be set with "emulator -prop qemu.sf.lcd_density=<value>", forcing
a specific density.

A later patch will allow the emulator to automatically set this property depending
on AVD hardware configuration settings.
2009-06-19 00:17:31 +02:00
Android (Google) Code Review
6f8b5c12d3 am de72697b: Merge change 4524 into donut
Merge commit 'de72697b771d33738c5f9d6c28087504e0796622'

* commit 'de72697b771d33738c5f9d6c28087504e0796622':
  FileRestoreHelper and RestoreHelperDispatcher work.
2009-06-17 21:49:21 -07:00
Android (Google) Code Review
253e8e34b3 Merge change 4533
* changes:
  Implement default programs and implement defaults and parents for imports.
2009-06-17 16:54:35 -07:00
Jason Sams
9c54bdbf45 Implement default programs and implement defaults and parents for imports. 2009-06-17 16:52:59 -07:00
Joe Onorato
efd0fab04b FileRestoreHelper and RestoreHelperDispatcher work. 2009-06-17 16:20:55 -07:00
Joe Onorato
251c89c0a7 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Joe Onorato
5f15d151b5 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Android (Google) Code Review
368d9c3ae4 Merge change 4426
* changes:
  Switch fountain to use ProgramVertex rather than hard coded camers in scripts.  Remove camera code from scripts.
2009-06-16 17:51:09 -07:00
Jason Sams
b37c0a5db6 Switch fountain to use ProgramVertex rather than hard coded camers in scripts. Remove camera code from scripts. 2009-06-16 17:49:58 -07:00
Mathias Agopian
69f066c8fc Merge commit 'goog/master' into merge_master 2009-06-16 12:38:55 -07:00
Mathias Agopian
151e859e0f new Permission class used to improve permission checks speed (by caching results) 2009-06-15 21:56:51 -07:00
Android (Google) Code Review
d1ac159d71 Merge change 4289
* changes:
  Bug fixes.  TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex.  Add matrix support classes.  Add test app rollo
2009-06-15 19:06:01 -07:00
Jason Sams
0826a6f90f Bug fixes. TriangleMesh now ref-counts, implement missing element formats, add missing modes for program vertex. Add matrix support classes. Add test app rollo 2009-06-15 19:04:56 -07:00
Christopher Tate
daf701fa62 am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.
2009-06-14 21:13:03 -07:00
Joe Onorato
1cf587496f Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput. 2009-06-12 16:21:24 -07:00
Android (Google) Code Review
bf85d63cb8 am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'

* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
  Make the file backup helper not crash if a file you requested
  Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2009-06-12 08:26:05 -07:00
Mathias Agopian
e19476214a protect ANDROID specific egl extension with #define 2009-06-11 17:19:54 -07:00
Joe Onorato
ce88cb15b5 Make the file backup helper not crash if a file you requested
can't be stated.  This means you don't need to know if the files
you are backing up exist or not -- we'll figure it out for you.
2009-06-11 14:51:45 -07:00
Android (Google) Code Review
31ff7a366f Merge change 3952
* changes:
  Split FountainView into View and RS parts.  Beging adding ProgramVertex to the java api.  It was already implemented in native.
2009-06-11 14:47:18 -07:00
Jason Sams
1fe9b8c3bd Split FountainView into View and RS parts. Beging adding ProgramVertex to the java api. It was already implemented in native. 2009-06-11 14:46:10 -07:00
Joe Onorato
23ecae3bbb Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
This took quite a bit of refactoring.
2009-06-11 11:29:57 -07:00
Android (Google) Code Review
43b605d682 Merge change 3850
* changes:
  Fix bug with bad conversion of java strings to C strings for object names.  Update test app to test object defines.
2009-06-10 19:09:37 -07:00
Android (Google) Code Review
bcf3e6a220 Merge change 3849
* changes:
  Fix build error due to bad path generation in makefile for generated tools. Implemented by JoeO
2009-06-10 19:09:07 -07:00
Jason Sams
d5680f9ba9 Fix bug with bad conversion of java strings to C strings for object names. Update test app to test object defines. 2009-06-10 18:39:40 -07:00
Jason Sams
196ac850af Fix build error due to bad path generation in makefile for generated tools.
Implemented by JoeO
2009-06-10 18:35:42 -07:00
Android (Google) Code Review
a10cb5a344 Merge change 3808
* changes:
  Split renderscript java code from test apps.  Update makefiles.
2009-06-10 16:24:47 -07:00
Jason Sams
94d8e90ad7 Split renderscript java code from test apps. Update makefiles. 2009-06-10 16:09:05 -07:00
Android (Google) Code Review
297ba9f5c4 Merge change 3776
* changes:
  Add named objects and implement support for ProgramFragmentStore and ProgramFragment to be used by name in scripts.
2009-06-10 15:05:22 -07:00
Jason Sams
3eaa338e11 Add named objects and implement support for ProgramFragmentStore and ProgramFragment to be used by name in scripts. 2009-06-10 15:04:38 -07:00
Jaikumar Ganesh
d5ac1ae36b Framework changes for bluez4.
Changes in the Bluetooth JNI calls and framework functions
for Bluez4.
2009-06-09 17:21:08 -07:00
Android (Google) Code Review
280412fa2c Merge change 3601
* changes:
  checkpoint pragma support.  Includes more cleanup of script enviroment storage to keep the env settings in the base and only the per language state in ScriptC.
2009-06-09 12:17:10 -07:00
Jason Sams
da423d8479 checkpoint pragma support. Includes more cleanup of script enviroment storage to keep the env settings in the base and only the per language state in ScriptC. 2009-06-09 12:15:30 -07:00
Android (Google) Code Review
5999cd7313 Merge change 3535
* changes:
  Move placement of script enviroment data to base.
2009-06-08 18:58:27 -07:00
Jason Sams
928f5cf287 Move placement of script enviroment data to base. 2009-06-08 18:50:13 -07:00
Android (Google) Code Review
f87e896955 Merge change 3485
* changes:
  Fix build issue and ref count bug with scripts.
2009-06-08 15:22:58 -07:00
Jason Sams
3a833d8e0f Fix build issue and ref count bug with scripts. 2009-06-08 15:20:31 -07:00
Android (Google) Code Review
7087c0eac2 Merge change 3386
* changes:
  Move call to compiler from jni to core library code.
2009-06-05 17:37:51 -07:00
Jason Sams
39ddc950c9 Move call to compiler from jni to core library code. 2009-06-05 17:35:09 -07:00
Mathias Agopian
51c8a3e00e Merge commit 'goog/master' into merge_master 2009-06-05 15:45:39 -07:00
Mathias Agopian
e583a4ea8c get rid of LogSocket which wasn't even implemented (enabled) 2009-06-05 15:11:23 -07:00
Mathias Agopian
55e3d60da5 break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used 2009-06-05 14:56:35 -07:00
Android (Google) Code Review
79525264e5 Merge change 3284
* changes:
  rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
2009-06-05 01:29:08 -07:00
Mathias Agopian
8ed6beb515 rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
StringArray is used in two places in framework/base and in the Sim. Ideally we should get rid of it and use Vector<String8> instead of creating new code.
2009-06-05 01:26:23 -07:00
Christopher Tate
3f0c72ab4b am 0032ce80: Fix back_up_files() error detection when opening/CRCing the file
Merge commit '0032ce80ac127e6bfb25d727162eee4af208dc77'

* commit '0032ce80ac127e6bfb25d727162eee4af208dc77':
  Fix back_up_files() error detection when opening/CRCing the file
2009-06-05 00:29:50 -07:00
Android (Google) Code Review
1b6aee1515 am 2a318867: Merge change 3203 into donut
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'

* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
  rename a few files to camel-case, add copyright notices
2009-06-04 22:44:18 -07:00
Jack Palevich
2a741ad51f Use ANSI style function declaration for RS scripts. 2009-06-04 20:16:39 -07:00
Mathias Agopian
2d5ee25556 fix a bunch of problems with destroying surfaces.
now, all destruction path, go through the purgatory which is emptied when ~ISurface is called, but we also make sure to remove the surface from the current list from there (in case a client forgot to request the destruction explicitely).
2009-06-04 18:46:21 -07:00