LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,858 Commits 2 Branches 0 Tags
8b51a39fda458039e68b650eb46f90b95f4bddca
Commit Graph

11858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
871e2f54ab Merge "Camera2: Turn off 3A when android.control.mode == OFF" 2012-12-18 14:25:50 -08:00
Igor Murashkin
37f8f607c1 Merge "Revert "Camera2: Fix a potential race condition in the readout thread"" 2012-12-18 14:22:25 -08:00
The Android Open Source Project
103af7c17d am a8af928f: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'a8af928f4e7dc3e0cd00bdaa0c168ac53fcd9bc0':
 2012-12-14 16:48:45 -08:00
Igor Murashkin
6d305d0183 Camera2: Turn off 3A when android.control.mode == OFF 
Change-Id: Ie6a8726e14529a8605b9ecae6adfa705e79df00a
 2012-12-14 14:17:36 -08:00
Igor Murashkin
c4464b7fee Revert "Camera2: Fix a potential race condition in the readout thread" 
The last fix incorrectly added a mutex lock which did not guard the appropriate
variables.

In fact it actually *introduced* a new race condition in a HAL test.

This reverts commit 6edd7ab4a4.
 2012-12-14 14:17:36 -08:00
The Android Open Source Project
a8af928f4e Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I189f31812ca5c5a5a6fc95ed35bf38664c6afb6a
 2012-12-14 14:03:15 -08:00
Derek Sollenberger
494524a7c9 Merge "Remove outdated FontLab app since Skia no longer uses it to tune gamma values." 2012-12-14 05:00:03 -08:00
The Android Automerger
35f8b6a16c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:39 -08:00
Joe Malin
dd067789b8 am 34b168f6: am 92a7f64c: am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '34b168f642a5dd30186ce76cdc9ef71d272c22cb':
  Android Training: Threads sample app
 2012-12-13 11:11:56 -08:00
Dirk Dougherty
4bda5fb0c5 am 5c2bd5a4: am 298ed7d6: am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '5c2bd5a4a5b34542ee762e070a0c241d43c83c1a':
  Add ko and ru to validLangs.
 2012-12-13 11:11:54 -08:00
Joe Malin
34b168f642 am 92a7f64c: am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '92a7f64c12fb7a186ed554d4b3c09214bbcc390a':
  Android Training: Threads sample app
 2012-12-13 11:07:06 -08:00
Joe Malin
92a7f64c12 am fa8f593a: am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit 'fa8f593a2adb12c7837972085cc63e8e0b12ebc6':
  Android Training: Threads sample app
 2012-12-13 11:04:56 -08:00
Joe Malin
fa8f593a2a am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '50600ba5d68e1e002bd8b6ca646be93f922d37ab':
  Android Training: Threads sample app
 2012-12-13 11:03:10 -08:00
Joe Malin
50600ba5d6 am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit 'a525bf719545fc315d03c1c6ee74f61e8dda03e0':
  Android Training: Threads sample app
 2012-12-13 11:00:59 -08:00
Joe Malin
a525bf7195 am 1e083591: am 2c063c88: Android Training: Threads sample app 
* commit '1e083591aed6b77408f6fce363bd48e63db92ed4':
  Android Training: Threads sample app
 2012-12-13 10:58:59 -08:00
Joe Malin
1e083591ae am 2c063c88: Android Training: Threads sample app 
* commit '2c063c889aa816e0de91bf17fdc0c78f48d5e2d0':
  Android Training: Threads sample app
 2012-12-13 10:57:14 -08:00
Dirk Dougherty
5c2bd5a4a5 am 298ed7d6: am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '298ed7d64025dd44eac5b318f414d4dc23e6f015':
  Add ko and ru to validLangs.
 2012-12-13 10:55:20 -08:00
Dirk Dougherty
298ed7d640 am 4b5dc0ce: am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '4b5dc0ce4dc52d1e3ccf9e8d09dd0af6568096dd':
  Add ko and ru to validLangs.
 2012-12-13 10:54:15 -08:00
Dirk Dougherty
4b5dc0ce4d am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev 
* commit '01b1a8739b338f50393e7c113d3a168710b45679':
  Add ko and ru to validLangs.
 2012-12-13 10:52:28 -08:00
Dirk Dougherty
01b1a8739b Merge "Add ko and ru to validLangs." into jb-mr1-dev 2012-12-13 10:34:26 -08:00
Dirk Dougherty
22c9415195 Add ko and ru to validLangs. 
Change-Id: I40d1a8e82d4b30cc2e787826252a85161e0157d8
 2012-12-13 10:00:30 -08:00
Andrew Hsieh
98e77475c1 am 4c5a8a60: am e4b3c7a3: Merge "Correct typo" 
* commit '4c5a8a606d57a36fbb61cb2a5128b66f83239b7e':
  Correct typo
 2012-12-12 15:24:28 -08:00
Andrew Hsieh
4c5a8a606d am e4b3c7a3: Merge "Correct typo" 
* commit 'e4b3c7a31d9647b468384668d2cee88295464a71':
  Correct typo
 2012-12-12 15:22:41 -08:00
Andrew Hsieh
e4b3c7a31d Merge "Correct typo" 2012-12-12 15:02:04 -08:00
Igor Murashkin
f1b72a3757 Merge "Camera2: Fix a potential race condition in the readout thread" 2012-12-12 12:47:58 -08:00
Igor Murashkin
52f7c8d4c6 Merge "Camera2: Fix a deadlock when closing the camera" 2012-12-12 12:47:47 -08:00
Joe Malin
2c063c889a Android Training: Threads sample app 
Change-Id: I6d07871acad31807eb4bf06aa8406b722320680c
 2012-12-12 10:47:58 -08:00
Andrew Hsieh
ba9d4ed16d am e9401bf6: am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>" 
* commit 'e9401bf645591990427bcce88a109cb472419599':
  Fix <endian.h> and <sys/endian.h>
 2012-12-12 06:07:36 -08:00
Andrew Hsieh
e9401bf645 am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>" 
* commit '4bddb6f5f7f1b00f2263b059156dfc07efea920b':
  Fix <endian.h> and <sys/endian.h>
 2012-12-12 06:05:12 -08:00
Andrew Hsieh
4bddb6f5f7 Merge "Fix <endian.h> and <sys/endian.h>" 2012-12-12 05:38:32 -08:00
Andrew Hsieh
d30385fc7c Correct typo 
Change-Id: I150ee24f93d1a4fe16de938dafb335a9f1a171b0
 2012-12-12 10:34:21 +08:00
Andrew Hsieh
ab13dd0e7a Fix <endian.h> and <sys/endian.h> 
See 4fa35d8ae80c175425e9525831d7b6a71a3ada60

Change-Id: Ia14386f2e762fd7c0a1fc8f3e7cf8c0ce05b1dd5
 2012-12-12 10:04:53 +08:00
The Android Open Source Project
66cb819500 am 7c1c45e4: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '7c1c45e449aea9141bd8cebb88c5fba08c704623':
 2012-12-10 15:21:28 -08:00
The Android Open Source Project
7c1c45e449 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I15433e982bbaa80391db117f5f1abd40469c70a6
 2012-12-10 15:19:19 -08:00
Raphael Moll
483a8796e8 am bae43244: am d8aa2895: Merge "SDK: fix sdk_repo build." 
* commit 'bae4324402ec0acc594a16af225f23dd76b28400':
  SDK: fix sdk_repo build.
 2012-12-10 13:38:33 -08:00
Raphael Moll
bae4324402 am d8aa2895: Merge "SDK: fix sdk_repo build." 
* commit 'd8aa2895f40018b13b1443144b5355d4b84f8acf':
  SDK: fix sdk_repo build.
 2012-12-10 13:36:41 -08:00
Raphael Moll
d8aa2895f4 Merge "SDK: fix sdk_repo build." 2012-12-10 13:17:16 -08:00
Raphael Moll
437419089c SDK: fix sdk_repo build. 
The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.

Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
 2012-12-10 13:06:52 -08:00
The Android Automerger
a6485a73ca merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 13:05:52 -08:00
Dirk Dougherty
80f2e3af43 am 13a7d3c2: am 8109f4f5: am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '13a7d3c2d8853c943031052c43c3630876139d61':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:30:15 -08:00
Dirk Dougherty
13a7d3c2d8 am 8109f4f5: am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '8109f4f5bbca8aa6a974a4b639b07831ae19743e':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:28:40 -08:00
Dirk Dougherty
8109f4f5bb am 7377374b: am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '7377374bf67bb99854a06032f8ca1c8781878ff7':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:27:10 -08:00
Dirk Dougherty
7377374bf6 am 7ca28063: Add redirect for IAB v3 restructure. 
* commit '7ca280639960cc18ad8a9b398c1e059df27597b5':
  Add redirect for IAB v3 restructure.
 2012-12-10 09:25:25 -08:00
Derek Sollenberger
4dd755b180 Remove outdated FontLab app since Skia no longer uses it to tune 
gamma values.

Change-Id: I9a6409b9c2fa8563413ccf3a6545b330d896042a
 2012-12-10 11:23:13 -05:00
Dirk Dougherty
7ca2806399 Add redirect for IAB v3 restructure. 
Change-Id: I65ccc6767408977a9756b217168b819b71816c1f
 2012-12-09 17:09:26 -08:00
Dianne Hackborn
36b302ba18 am 3509481c: am f443913a: am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit '3509481cfae4b8dc0fdba4836bfc36e2bd04045e':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:24:02 -08:00
Dianne Hackborn
3509481cfa am f443913a: am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit 'f443913ad3e44403819f3c740bcf30bc18f74170':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:22:26 -08:00
Dianne Hackborn
f443913ad3 am 613e19b7: SDK Only: Fix search interaction with various samples. 
* commit '613e19b74072896464e1980d84dc27c2a9f4471a':
  SDK Only: Fix search interaction with various samples.
 2012-12-07 13:21:03 -08:00
Igor Murashkin
6edd7ab4a4 Camera2: Fix a potential race condition in the readout thread 
Change-Id: Ie4475c8433eaad7545430f7e01e222d074180e0e
 2012-12-07 12:34:20 -08:00
Igor Murashkin
0825f8b65b Camera2: Fix a deadlock when closing the camera 
Change-Id: I8b6be364ca90b0eed62ae03c1548680c0b2f0e64
 2012-12-07 12:32:00 -08:00