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

10429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
42467d908f Merge "EmulatedFakeCamera2: Add face detection support." into jb-mr1-dev 2012-08-13 10:13:47 -07:00
Eino-Ville Talvala
ae031a1aea EmulatedFakeCamera2: Add face detection support. 
Bug: 6243944c

Change-Id: Ice45571b44af2975cc699e4e8b95fb170a889117
 2012-08-13 09:40:14 -07:00
Kenny Root
ff61da9b3a am e2ba6f72: am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests" 
* commit 'e2ba6f72dc7f4ffa6323dfd5338de29bbd8fa35f':
  Remove useless TestRunner for KeyStoreTests
 2012-08-13 09:26:02 -07:00
Kenny Root
e2ba6f72dc am ecab0379: Merge "Remove useless TestRunner for KeyStoreTests" 
* commit 'ecab03799b34108924b88183d9bde14329691fbb':
  Remove useless TestRunner for KeyStoreTests
 2012-08-13 09:15:32 -07:00
Kenny Root
ecab03799b Merge "Remove useless TestRunner for KeyStoreTests" 2012-08-13 09:01:55 -07:00
Nick Pelly
cd0827adb7 Update config.xml overlay for new key config_overlay_locationProviderPackageNames 
Change-Id: I6119516077d018f6c149fa006fb011cfe809f688
 2012-08-10 18:08:35 -07:00
Kenny Root
4e0e948e3b Remove useless TestRunner for KeyStoreTests 
InstrumentationTestRunner can enumerate the test cases to run without a
special TestRunner in KeyStoreTests.

Change-Id: I9e849d035d78b51ca9a73c52012dab448fc4a7ee
 2012-08-10 13:41:20 -07:00
Eino-Ville Talvala
819d2aac43 Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev 2012-08-10 12:38:05 -07:00
The Android Open Source Project
81a034f147 am f6de0952: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'f6de0952d12995ae8808f46d0e4fa1f6974c1d61':
 2012-08-10 12:36:41 -07:00
The Android Open Source Project
f6de0952d1 Reconcile with jb-mr0-release - do not merge 
Change-Id: I4cf69544b3cddd8558400e57aa20edca8d0b535b
 2012-08-10 08:33:58 -07:00
The Android Automerger
0ead859f71 merge in jb-mr0-release history after reset to jb-dev 2012-08-09 11:36:40 -07:00
Andy Stadler
bacdb6afd2 Add telephony intermediates to classpath 
Change-Id: I019e3f2d4d3eb570590a8d1758b82cc1c1669c19
 2012-08-09 08:16:26 -07:00
Wink Saville
eae8078ded Add opt/telephony and opt/mms to eclipse .classpath 
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
 2012-08-09 08:16:19 -07:00
Eino-Ville Talvala
f856a82b87 EmulatedFakeCamera2: Add autofocus management 
- Add skeleton ControlThread for 3A processing
- Add fake autofocus management into ControlThread
- Support AUTO, MACRO, CONTINUOUS_PICTURE, CONTINUOUS_VIDEO

Bug: 6243944
Change-Id: Ic47f5be642d4705db86021b94aaba8dcc7f32cf0
 2012-08-08 10:43:37 -07:00
Scott Main
fbd1a85d7b am 5e01d367: am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit '5e01d367b08ea225af6bca294acd04706ecaede2':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:24:59 -07:00
Scott Main
5e01d367b0 am ef91cce8: Merge "remove all zip files for training class samples. They\'re now at frameworks/base/docs/downloads/" into jb-dev 
* commit 'ef91cce81b6b89c5d47c6fbda9ea913a95fa7d46':
  remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/
 2012-08-07 15:23:33 -07:00
Scott Main
ef91cce81b Merge "remove all zip files for training class samples. They're now at frameworks/base/docs/downloads/" into jb-dev 2012-08-07 15:21:00 -07:00
Scott Main
826be7b0f9 remove all zip files for training class samples. 
They're now at frameworks/base/docs/downloads/

Change-Id: I3a82edcc73196dfc8ffc6a1e4d172925d5581157
 2012-08-07 15:13:23 -07:00
Elliott Hughes
60fa2c3888 am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit 'ede21119df2a9bfed7125380fbe7af32c7aa13e3':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:23:27 -07:00
Elliott Hughes
ede21119df am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit 'fdb7308bb75e503486be134103d1260aadec8cae':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:22:05 -07:00
Elliott Hughes
fdb7308bb7 Merge "Use uintptr_t for cast pointer to integer." 2012-08-06 13:15:16 -07:00
Xavier Ducrohet
e5fcbb1ba9 am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit 'e76ba31077b42e4e2de1aa4af47db6bf9213cba6':
  Add Mips support to SDK.
 2012-08-02 17:24:40 -07:00
Xavier Ducrohet
e76ba31077 am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit '78f6f9b1f34e543e0806cfb0393e29b1e39ae84f':
  Add Mips support to SDK.
 2012-08-02 17:22:57 -07:00
Xavier Ducrohet
78f6f9b1f3 Merge "Add Mips support to SDK." 2012-08-02 17:04:19 -07:00
Nick Pelly
c1ca7cfbdc Merge "Update eclipse .classpath" into jb-mr1-dev 2012-08-01 16:13:21 -07:00
Nick Pelly
0956cd2055 Update eclipse .classpath 
Change-Id: I0b9120c72c2e59544339280606307a9ebd15db51
 2012-08-01 16:11:27 -07:00
The Android Open Source Project
d397be39eb am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '215695fe5e84f1fd7acecf1bec68c6dd69ea3247':
 2012-07-31 14:49:16 -07:00
The Android Open Source Project
215695fe5e Reconcile with jb-mr0-release - do not merge 
Change-Id: I5fffe5e9074ea03b0b9b31cde72dc4d6676f730a
 2012-07-31 14:47:51 -07:00
The Android Automerger
2fd2eacf1c merge in jb-mr0-release history after reset to jb-dev 2012-07-31 14:07:07 -07:00
SangWook Han
ac8ed5e089 Use uintptr_t for cast pointer to integer. 
On 64bit host, sizeof pointer is not equal to sizeof int.
	Need for host tools.

Change-Id: I848ceb878b873e6764a077e8a4ee31e756f30017
 2012-07-31 11:02:59 +09:00
Scott Main
0ed29970de am 1fc6c8dd: am a3ba2ea7: Merge "docs: quotes in comments apparently crash the server" into jb-dev 
* commit '1fc6c8dd48e875d39c0bf8b7013437db389051e6':
  docs: quotes in comments apparently crash the server
 2012-07-30 14:17:37 -07:00
Scott Main
1fc6c8dd48 am a3ba2ea7: Merge "docs: quotes in comments apparently crash the server" into jb-dev 
* commit 'a3ba2ea7251756425ae4a076126a1d73de6fe0a4':
  docs: quotes in comments apparently crash the server
 2012-07-30 14:12:19 -07:00
Scott Main
a3ba2ea725 Merge "docs: quotes in comments apparently crash the server" into jb-dev 2012-07-30 14:10:19 -07:00
The Android Open Source Project
84c68cad1e am f3c5b01d: Reconcile with jb-mr0-release jb-release 
* commit 'f3c5b01d6d1a1a3ca1b2df4032849948a60bcbc4':
 2012-07-27 15:45:27 -07:00
The Android Open Source Project
f3c5b01d6d Reconcile with jb-mr0-release jb-release 
Change-Id: I64ab1cee03a49427cd6fe1468f984cd3c113d8b1
 2012-07-27 14:50:18 -07:00
The Android Automerger
dd89937aa3 merge in jb-mr0-release history after reset to jb-dev 2012-07-26 17:49:27 -07:00
Scott Main
f4ac8bb21d docs: quotes in comments apparently crash the server 
Change-Id: Ie0b47ccde141cb7ffdf243de20411bffbf94fa41
 2012-07-26 15:54:19 -07:00
Scott Main
1a14e24067 am 1aeb3525: am 3a76c1fd: Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev 
* commit '1aeb3525e1a49ed654eb7fe1855f40aa0d1c1b0d':
  docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site.
 2012-07-26 15:42:50 -07:00
Scott Main
1aeb3525e1 am 3a76c1fd: Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev 
* commit '3a76c1fd1b99c7c2f6df19ec54d4948c9dd1b204':
  docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site.
 2012-07-26 15:41:33 -07:00
Scott Main
3a76c1fd1b Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev 2012-07-26 15:39:44 -07:00
Xavier Ducrohet
a9df473153 am efce10c7: am 6ca669e4: Merge "Update support lib to r10." into jb-dev 
* commit 'efce10c7f8f0085cb32723030f5dc8e17d55cbca':
  Update support lib to r10.
 2012-07-26 13:18:47 -07:00
Xavier Ducrohet
efce10c7f8 am 6ca669e4: Merge "Update support lib to r10." into jb-dev 
* commit '6ca669e435e3f2dd8dfc084d318b856bcaa1f9a7':
  Update support lib to r10.
 2012-07-26 13:17:01 -07:00
Xavier Ducrohet
6ca669e435 Merge "Update support lib to r10." into jb-dev 2012-07-26 13:15:21 -07:00
Xavier Ducrohet
2a7c34af40 Update support lib to r10. 
Change-Id: Ic0c4546566c237cda17d3e4820554424e0e885dd
 2012-07-26 13:14:51 -07:00
Eino-Ville Talvala
05940c4d69 Camera2: Use lower resolutions for front fake camera. DO NOT MERGE 
To differentiate front/back fake camera, support a lower set of
resolutions for the front camera processed and jpeg streams.

Bug: 6243944
Change-Id: I4a8746500944f7b445e0e5f0a3f441885733a7a4
 2012-07-26 10:04:38 -07:00
Eino-Ville Talvala
1e903b0745 Camera2: Fix deadlock issues with getInProgressCount. DO NOT MERGE 
Bug: 6243944
Change-Id: Icb32e4b8c4a916eb7c97ac18767cadfc5122ec88
 2012-07-26 10:04:16 -07:00
Eino-Ville Talvala
b0bd05236f EmulatedFakeCamera2: Add recording support for 320x240, NV21. DO NOT MERGE 
- Support 320x240 in addition to 640x480
- Support NV21 (monochrome only right now)
- Base simulated time on system time,
  since stagefright cares about timestamp base
- Use emulator magic gralloc format to enable gralloc to pick format based on
  destination.

Bug: 6243944
Change-Id: I3ea56bca726c69b51e03233ce86d4881401a3ffd
 2012-07-26 10:03:35 -07:00
Eino-Ville Talvala
4d57cb8d65 gralloc: Add automatic format selection. DO NOT MERGE 
Have gralloc_alloc be able to select the appropriate pixel format
given the endpoints, triggered by new
GRALLOC_EMULATOR_PIXEL_FORMAT_AUTO format.

Currently supports camera->screen, and camera->video encoder.

Bug: 6243944
Change-Id: Ib1bf8da8d9184ac99e7f50aad09212c146c32809
 2012-07-26 10:03:05 -07:00
Andrew Hsieh
8d0226a862 am 123f27e9: am 21f8a3c5: Merge "Add comments about why "call" instead of "jump" is used." 
* commit '123f27e9fd5cfd6b1e157d9471e640ead43e007f':
  Add comments about why "call" instead of "jump" is used.
 2012-07-25 22:24:04 -07:00
Andrew Hsieh
123f27e9fd am 21f8a3c5: Merge "Add comments about why "call" instead of "jump" is used." 
* commit '21f8a3c51d15c3d270be3923f518e047eaee6d04':
  Add comments about why "call" instead of "jump" is used.
 2012-07-25 22:22:17 -07:00