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

10336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
0ba35c9053 Reconcile with jb-mr1-release - do not merge 
Change-Id: I4dbbd2b4acfd1b4c46645d251e3381ebaa7f8140
 2012-08-07 11:02:51 -07:00
The Android Automerger
c8123801f6 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-07 06:33:44 -07:00
Elliott Hughes
542d07a3b2 am 60fa2c38: am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer." 
* commit '60fa2c38883e7ad288e579804485ed77d7df923f':
  Use uintptr_t for cast pointer to integer.
 2012-08-06 13:25:26 -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
The Android Open Source Project
2deb558254 Reconcile with jb-mr1-release - do not merge 
Change-Id: Idbdf5795c4c239be1c515090c0f711cc7eb5c80b
 2012-08-06 13:18:20 -07:00
Elliott Hughes
fdb7308bb7 Merge "Use uintptr_t for cast pointer to integer." 2012-08-06 13:15:16 -07:00
The Android Automerger
1fa2dfd59a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:27:41 -07:00
Xavier Ducrohet
76ad81c9ba am e5fcbb1b: am e76ba310: am 78f6f9b1: Merge "Add Mips support to SDK." 
* commit 'e5fcbb1ba9b78e7a973126b4cdc4aa6956f78e7d':
  Add Mips support to SDK.
 2012-08-02 17:26:51 -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
The Android Open Source Project
a6c3f0b46e Reconcile with jb-mr1-release - do not merge 
Change-Id: I34cec93953b7f525dd5f197fca616648ded151f4
 2012-08-02 11:26:23 -07:00
The Android Automerger
7a3c074423 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:14:26 -07:00
Nick Pelly
a495fa4c69 am c1ca7cfb: Merge "Update eclipse .classpath" into jb-mr1-dev 
* commit 'c1ca7cfbdcdefd315d22e6eba0fc421abffccab3':
  Update eclipse .classpath
 2012-08-01 16:15: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
3d4bc81710 Reconcile with jb-mr1-release - do not merge 
Change-Id: I0b462099aeb6f8cad759b33c16263720d87cec4b
 2012-07-31 15:02:38 -07:00
The Android Open Source Project
287f654637 am d397be39: am 215695fe: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'd397be39eb7db29f3a52f63bf34c370ff0eaed6b':
 2012-07-31 14:52:49 -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
The Android Automerger
73941e1f8e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-31 07:35:16 -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
The Android Open Source Project
5f19d55f26 Reconcile with jb-mr1-release 
Change-Id: I38e24bd3e44c22025f88fbbf2d28f2148debd741
 2012-07-30 15:03:38 -07: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
9f749ed1ff am 84c68cad: am f3c5b01d: Reconcile with jb-mr0-release jb-release 
* commit '84c68cad1e4b698f08fd7c09a4bf0bb4d058dce0':
 2012-07-27 16:23:46 -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
2bd449b0d5 am 1a14e240: 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 '1a14e2406708a7404e671f7d6751842c3b654fe9':
  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:46:24 -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
18411bb339 am a9df4731: am efce10c7: am 6ca669e4: Merge "Update support lib to r10." into jb-dev 
* commit 'a9df4731531c34a3595b316c1c6b6bd8dc519d84':
  Update support lib to r10.
 2012-07-26 13:22:21 -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
d36d5ab60f am 05940c4d: (-s ours) Camera2: Use lower resolutions for front fake camera. DO NOT MERGE 
* commit '05940c4d695660324e61e01a516c89bbc907d96d':
  Camera2: Use lower resolutions for front fake camera. DO NOT MERGE
 2012-07-26 10:48:34 -07:00
Eino-Ville Talvala
9c3d157a0f am 1e903b07: (-s ours) Camera2: Fix deadlock issues with getInProgressCount. DO NOT MERGE 
* commit '1e903b0745bfee821297dc837500e1c8a93bbe33':
  Camera2: Fix deadlock issues with getInProgressCount. DO NOT MERGE
 2012-07-26 10:48:32 -07:00
Eino-Ville Talvala
314ea2f964 am b0bd0523: (-s ours) EmulatedFakeCamera2: Add recording support for 320x240, NV21. DO NOT MERGE 
* commit 'b0bd05236f2d74cbbfe4e8cc1a41f451497042e1':
  EmulatedFakeCamera2: Add recording support for 320x240, NV21. DO NOT MERGE
 2012-07-26 10:48:31 -07:00
Eino-Ville Talvala
68ae0498e9 am 4d57cb8d: (-s ours) gralloc: Add automatic format selection. DO NOT MERGE 
* commit '4d57cb8d6542f7fd82614a082de4b835de0d60eb':
  gralloc: Add automatic format selection. DO NOT MERGE
 2012-07-26 10:48:30 -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