Eino-Ville Talvala
423650c32c
EmulatedFakeCamera2: Minor fixes
...
- Add some error checking
- Change default exposure/gain to avoid overexposure.
- Improve gain calculation for RGBA output
Bug: 6243944
Change-Id: Iaa9f35e0b62883a947cc9e63f86d0ec3ae828576
2012-06-08 09:52:38 -07:00
Xavier Ducrohet
547975cf50
am 98a05b89: am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git"
...
* commit '98a05b894e6f2981816a87ea0dbd6a3092d5c507':
Move emugl system code to development.git
2012-06-07 12:21:17 -07:00
Xavier Ducrohet
98a05b894e
am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git"
...
* commit '21f4ca579e58e9a2eaad841f5174eba44c926153':
Move emugl system code to development.git
2012-06-07 12:19:21 -07:00
Xavier Ducrohet
21f4ca579e
am 74ed92d3: Merge "Move emugl system code to development.git"
...
* commit '74ed92d325ec1eb9287a79fff3ca62c7f0f864f8':
Move emugl system code to development.git
2012-06-07 12:17:21 -07:00
Xavier Ducrohet
74ed92d325
Merge "Move emugl system code to development.git"
2012-06-07 12:13:23 -07:00
The Android Open Source Project
08103ee0a1
am 1d1b78da: Reconcile with jb-release
...
* commit '1d1b78daa78a67760247247021e082e36b856c3a':
2012-06-07 07:51:46 -07:00
The Android Open Source Project
1d1b78daa7
Reconcile with jb-release
...
Change-Id: I0f90bd02e18ed8b5e8b3e2d39d6462d94969e3e4
2012-06-07 07:48:52 -07:00
Xavier Ducrohet
c51484c1ce
am 344e27f2: am e0db6a0c: am 392863b7: Merge "Remove tab only if tab exists."
...
* commit '344e27f238903a46cb48082453abb357052e19d1':
Remove tab only if tab exists.
2012-06-06 14:54:49 -07:00
Xavier Ducrohet
344e27f238
am e0db6a0c: am 392863b7: Merge "Remove tab only if tab exists."
...
* commit 'e0db6a0c5523678f42229e99ea4598dc52b862eb':
Remove tab only if tab exists.
2012-06-06 14:52:36 -07:00
Xavier Ducrohet
e0db6a0c55
am 392863b7: Merge "Remove tab only if tab exists."
...
* commit '392863b774874dff5ca4df3d336c5d459f014697':
Remove tab only if tab exists.
2012-06-06 14:50:50 -07:00
Xavier Ducrohet
392863b774
Merge "Remove tab only if tab exists."
2012-06-06 14:44:26 -07:00
Jesse Hall
56513f5ff4
Move emugl system code to development.git
...
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.
A few changes were made beyond simply cloning the directories:
(a) Makefiles were modified to only build the relevant components. Not
doing so would break the build due to having multiple rule
definitions.
(b) Protocol spec files were moved from the guest encoder directories
to the host decoder directories. The decoder must support older
versions of the protocol, but not newer versions, so it makes
sense to keep the latest version of the protocol spec with the
decoder.
(c) Along with that, the encoder is now built from checked in
generated encoder source rather than directly from the protocol
spec. The generated code must be updated manually. This makes it
possible to freeze the system encoder version without freezing the
host decoder version, and also makes it very obvious when a
protocol changes is happening that will require special
backwards-compatibility support in the decoder/renderer.
(d) Host-only and system-only code were removed from the repository
where they aren't used.
(e) README and DESIGN documents were updated to reflect this split.
No actual source code was changed due to the above.
Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
2012-06-06 09:46:29 -07:00
The Android Automerger
50a5d15e3d
merge in jb-release history after reset to jb-dev
2012-06-05 06:52:17 -07:00
Dianne Hackborn
fbd3ffd27e
am 4914a5f3: am 80df91c7: New API demos for retained fragments with loaders.
...
* commit '4914a5f37bfd861aef3a17ad222d6c9742032684':
New API demos for retained fragments with loaders.
2012-06-04 11:24:15 -07:00
Dianne Hackborn
4914a5f37b
am 80df91c7: New API demos for retained fragments with loaders.
...
* commit '80df91c7f2ac155c1cf4c3337f8db5a4bf5426b5':
New API demos for retained fragments with loaders.
2012-06-04 11:21:34 -07:00
Dianne Hackborn
80df91c7f2
New API demos for retained fragments with loaders.
...
Also tweak the cursor loader samples to filter out query
callbacks that don't change the filter, to avoid restarting the
loader on a configuration change.
Change-Id: Iac9293fed45e127698be59262d68b0b59a8ec9ce
2012-06-04 11:12:37 -07:00
Chiao Cheng
6b2b55ac2a
Merge "Updating intellij idegen project template to use jdk 1.6."
2012-06-04 11:06:16 -07:00
The Android Automerger
2d69b07115
merge in jb-release history after reset to jb-dev
2012-06-03 06:00:33 -07:00
Chiao Cheng
797198bbe0
Updating intellij idegen project template to use jdk 1.6.
...
Also excluding prebuilt jars from classpath. These include all
previous versions of the android sdk jars. Increased heap size to 800
so google intellij plugin does not complain. Changed default
configuration to use global code style insead of per project code
style.
Change-Id: If97550000fdc282cf6d506eb80b830ff4c1b87b9
2012-06-01 15:27:36 -07:00
Eino-Ville Talvala
4cdc74e854
Merge "EmulatedFakeCamera2: Add opaque stream output support"
2012-06-01 10:47:13 -07:00
Andrew Hsieh
2bcbee88f0
am 295ba8d3: am 93122516: am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
...
* commit '295ba8d381bca730a5caf242871564c0ed1f9319':
ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:07:11 -07:00
Andrew Hsieh
295ba8d381
am 93122516: am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
...
* commit '93122516a7afb92a4581da51305d2ce208757a22':
ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:04:52 -07:00
Andrew Hsieh
93122516a7
am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
...
* commit 'c424ad10606977edab8d81a39eca68ddf00ec686':
ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:02:51 -07:00
Andrew Hsieh
c424ad1060
Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
2012-06-01 03:51:09 -07:00
Jeff Brown
1ab4de260d
am 4a0c2c51: am 50d57364: Fix libutils test package path.
...
* commit '4a0c2c515149e4dd654c0bf47953f85a3fc52fd9':
Fix libutils test package path.
2012-05-31 16:56:22 -07:00
Jeff Brown
4a0c2c5151
am 50d57364: Fix libutils test package path.
...
* commit '50d57364f97135906e3acd627d8c3327057d4bb4':
Fix libutils test package path.
2012-05-31 16:53:26 -07:00
Jeff Brown
50d57364f9
Fix libutils test package path.
...
Change-Id: Ibee2db4e75c5872d94984a02ef8bbdc6bd1e4b33
2012-05-31 16:08:05 -07:00
Brett Chabot
5e2129fef0
Merge "Fixed error messages for retrieving environment variables"
2012-05-31 10:54:55 -07:00
David 'Digit' Turner
5e7c4e6a57
ndk: Remove prebuilt C runtime objects. Add sources instead.
...
This patch removes all prebuilt C runtime object files from
the ndk/platforms/ directory. We replace them with equivalent
assembly sources lifted from the following directories:
bionic/libc/private/ (for __dso_handle.S and __dso_handle_so.S)
bionic/libc/arch-$ARCH/ (for all others)
Note: This requires that your NDK's gen-platforms.sh script be
capable of rebuilding the object files from sources.
See https://android-review.googlesource.com/36822
The goal here is to make it much easier to update these files,
and track their changes relative to the content of bionic/lib.
For example to fix the following issues in the future:
Change-Id: If4c84e2584b0e58ca3585b034bb8a13a8add8ab9
http://code.google.com/p/android/issues/detail?id=26911
http://code.google.com/p/android/issues/detail?id=23203
2012-05-31 10:58:57 +02:00
Raphael Moll
96a1131788
am d9a06fa8: am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
...
* commit 'd9a06fa8a9f303755103f3b2d051b83b352f59d7':
SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:25:30 -07:00
Raphael Moll
d9a06fa8a9
am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
...
* commit 'a8fd9e0a3bddffb1aa17bc22b86352a1db36160d':
SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:21:05 -07:00
Raphael Moll
a8fd9e0a3b
am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
...
* commit '86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab':
SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:18:28 -07:00
Raphael Moll
86ef5ca7e3
Merge "SDK: Ability to generate repos in XSD repository-7."
2012-05-30 15:00:11 -07:00
The Android Open Source Project
7a961223f5
am 62f4d9d3: Reconcile with jb-release
...
* commit '62f4d9d3a3570aaa24e768a49c48dfb272d70838':
2012-05-30 10:14:36 -07:00
The Android Open Source Project
62f4d9d3a3
Reconcile with jb-release
...
Change-Id: If7cd3a5fcbf1bfaee64835c6b3ef7bf858f73b88
2012-05-30 10:12:49 -07:00
The Android Automerger
03ffe7fe8a
merge in jb-release history after reset to jb-dev
2012-05-30 07:00:17 -07:00
Nick Pelly
a4bfc662ad
am 3a8d9ff8: am 6cc9755b: Update device for new location provider configs.
...
* commit '3a8d9ff84ac46e4f1102cb601b5490c2b04e5802':
Update device for new location provider configs.
2012-05-29 16:24:41 -07:00
Nick Pelly
3a8d9ff84a
am 6cc9755b: Update device for new location provider configs.
...
* commit '6cc9755baac9cde9b1327cd090c5d6bea6dbbb00':
Update device for new location provider configs.
2012-05-29 16:22:45 -07:00
Nick Pelly
6cc9755baa
Update device for new location provider configs.
...
Change-Id: I7d3cf81a5ba1ff7e2ac56f125d8b3454a6bd11c4
2012-05-29 15:56:20 -07:00
Chiao Cheng
cda9ca289f
Merge "Up line width from 80 to 100."
2012-05-29 14:46:54 -07:00
Michael Wright
5177da5f5b
Fixed error messages for retrieving environment variables
...
Change-Id: Ib84479bfc702de1e1c6a0d09ed7ccf6ad06e1b2b
2012-05-29 11:59:24 -07:00
The Android Open Source Project
b46991523a
am dbe89925: Reconcile with jb-release nakasi-factoryrom-release
...
* commit 'dbe899259b610bef8fcdbc4e23cb8313888848c7':
2012-05-29 09:41:44 -07:00
The Android Open Source Project
dbe899259b
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ie2368fb992d54d2f97abc7de822b122cd8909941
2012-05-29 09:39:24 -07:00
The Android Automerger
4de07346db
merge in jb-release history after reset to jb-dev
2012-05-29 08:55:28 -07:00
Xavier Ducrohet
f63690de4c
am 331d69be: am af0576fc: Merge "Remove outdated PDK." into jb-dev
...
* commit '331d69be99d9662effbb4ae856d9ac16276826cc':
Remove outdated PDK.
2012-05-25 13:27:04 -07:00
Xavier Ducrohet
331d69be99
am af0576fc: Merge "Remove outdated PDK." into jb-dev
...
* commit 'af0576fc765118f791a5eb9cdaaeed07c20b166a':
Remove outdated PDK.
2012-05-25 13:24:43 -07:00
Xavier Ducrohet
af0576fc76
Merge "Remove outdated PDK." into jb-dev
2012-05-25 13:22:18 -07:00
Marc Blank
b337343ed9
am 1d7f5824: am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
...
* commit '1d7f5824ec5d3b1d7859a5d5b5fd736258680ead':
Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:11:21 -07:00
Marc Blank
1d7f5824ec
am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
...
* commit '2476301f4dce7769b02fe4157f3134254cc1a4d8':
Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:08:41 -07:00
Chiao Cheng
87cfafaa3d
Up line width from 80 to 100.
...
Change-Id: Ic2e2bff15c8eed15a32070909683f6e4e5d96b4e
2012-05-24 19:44:00 -07:00