LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,029 Commits 2 Branches 0 Tags
c4ae6ea167225a609366f8fa25e95ed1b36a79f2
Commit Graph

10029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
c4ae6ea167 Merge "EmulatedFakeCamera2: Implement basic dump()" 2012-06-14 11:19:24 -07:00
Eino-Ville Talvala
cc588adda3 EmulatedFakeCamera2: Implement basic dump() 
Bug: 6243944
Change-Id: I84696ea79f8c36d34c2cccdac259c9baba048c1f
 2012-06-14 10:52:04 -07:00
Eino-Ville Talvala
f6c061fdfc Merge "EmulatedFakeCamera2: Add support for JPEG output, multiple streams" 2012-06-13 17:25:19 -07:00
Eino-Ville Talvala
4cb80a83bc Merge "Emulator gralloc: Support HAL_PIXEL_FORMAT_BLOB" 2012-06-13 17:25:12 -07:00
Xavier Ducrohet
82c9791a50 am 088cab2a: am 35c48dcf: Update SDK revision files. 
* commit '088cab2af96a1ae227a7fccf0610801c0beb065b':
  Update SDK revision files.
 2012-06-13 13:03:37 -07:00
Xavier Ducrohet
088cab2af9 am 35c48dcf: Update SDK revision files. 
* commit '35c48dcfe16d8b43fb17524ccc6167d9b11114d2':
  Update SDK revision files.
 2012-06-13 13:00:00 -07:00
Xavier Ducrohet
35c48dcfe1 Update SDK revision files. 
Change-Id: Ib6e9e0c6a1aacef6e7a68d939318d901fb9b4bf3
 2012-06-13 12:54:21 -07:00
Eino-Ville Talvala
79c366593b Merge "EmulatedFakeCamera2: Minor fixes" 2012-06-13 12:09:38 -07:00
Eino-Ville Talvala
e26e64f2de EmulatedFakeCamera2: Add support for JPEG output, multiple streams 
Required to support Camera.takePicture()

Bug: 6243944
Change-Id: I60d7a161a7037c25428eac5a6f9327aff47da584
 2012-06-13 12:08:28 -07:00
Eino-Ville Talvala
2a2ada537a Emulator gralloc: Support HAL_PIXEL_FORMAT_BLOB 
Bug: 6243944
Change-Id: I2864bc59be9df8741639a291c71e2f65dde5bc0b
 2012-06-13 12:08:18 -07:00
Andrew Hsieh
0d044f5534 am 852f1ba2: am 0fced7b1: am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '852f1ba2ea00da5890bfc479a2d89867c1a67e51':
  ndk: Remove if_dl.h header
 2012-06-12 17:24:26 -07:00
Andrew Hsieh
852f1ba2ea am 0fced7b1: am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '0fced7b1f6150de6c893680060fb187da735f6fa':
  ndk: Remove if_dl.h header
 2012-06-12 17:21:55 -07:00
Andrew Hsieh
0fced7b1f6 am 3f8b673b: Merge "ndk: Remove if_dl.h header" 
* commit '3f8b673b24c5dc0cf0023554ead34a9a1e446dbd':
  ndk: Remove if_dl.h header
 2012-06-12 17:20:03 -07:00
Andrew Hsieh
3f8b673b24 Merge "ndk: Remove if_dl.h header" 2012-06-12 17:16:28 -07:00
Jean-Baptiste Queru
bf133cf2dd am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp 
* commit '401a65b7846fb87991142d9caa4a6176f75bbe27':
  Fix Eclipse classpath file for ICS.
 2012-06-12 08:02:08 -07:00
Jean-Baptiste Queru
401a65b784 resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp 
Change-Id: I50fb4331347a1921a5a75eb91a216c7e0499e2d6
 2012-06-12 07:58:42 -07:00
Jean-Baptiste Queru
45cb1b0a85 am 376154d4: Merge "Fix Eclipse classpath file for ICS." 
* commit '376154d427968e3a43088860fab81d9de5bf7270':
  Fix Eclipse classpath file for ICS.
 2012-06-12 07:46:26 -07:00
Jean-Baptiste Queru
376154d427 Merge "Fix Eclipse classpath file for ICS." 2012-06-12 07:31:50 -07:00
Andrew Hsieh
62ef547786 ndk: Remove if_dl.h header 
Remove AF_LINK and sockaddr_dl which are specpfic to BSD
(ie. doesn't exist in Linux)

Change-Id: I47fe4cdf76df14af99eaa17cfc366a65aee3f5ae
 2012-06-12 10:38:00 +08:00
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