LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,088 Commits 2 Branches 0 Tags
3fd7d3d383fd64e4a8b334ab831ece073580c02c
Commit Graph

12088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Koch
48820d230d am 15493fd9: am 784be44a: am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies 
* commit '15493fd9c382bad416c434fe048c87fe2a2fe589':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies
 2013-01-11 10:53:25 -08:00
Andrew Hsieh
a9daeb07be am d75ec23e: am 02faddde: am 14b0ab7a: Merge "Sync stddef.h" 
* commit 'd75ec23e4677e87e66a101e6de0bfd34cd9129bb':
  Sync stddef.h
 2013-01-10 15:38:32 -08:00
Andrew Hsieh
46d35992f9 am 80fc9e53: am 888c33e7: am 7d6e4794: Merge "Sync MIPS fenv.h" 
* commit '80fc9e5325392f64bb0dab6450538437bfd94960':
  Sync MIPS fenv.h
 2013-01-10 15:38:20 -08:00
Andrew Hsieh
cd4f6b5f8c am bc8fa78f: am e9fac40c: am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1" 
* commit 'bc8fa78f0348af77c32b2cdc8dbfd84838195163':
  Fix san-sangeles warnings with clang 3.1
 2013-01-10 15:38:19 -08:00
Igor Murashkin
caf8379a8d am ba48d6f0: Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev 
* commit 'ba48d6f00c9a13ba00022949c87215ecf4b829aa':
  Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
  Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
  Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
  Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
 2013-01-10 13:35:36 -08:00
Igor Murashkin
8b622fe360 am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev 
* commit '10665f4b0c5dc94ce7cceaa1fd60a8c29b384114':
  Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
 2013-01-10 13:35:35 -08:00
Igor Murashkin
ae6c881bc5 am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev 
* commit '778dd967ade8c37b4b4fc6afdd6b5f2a2a2d6875':
  Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
 2013-01-10 13:35:34 -08:00
Igor Murashkin
6917606e04 am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev 
* commit '6daf70b26bfddf9ad079b925c0d586b789e3c207':
  Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
 2013-01-10 13:35:32 -08:00
Igor Murashkin
ba48d6f00c Merge changes I36c3dcaa,I7574913a,I8db9d918,I37e2c005 into jb-mr1-aah-dev 
* changes:
  Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
  Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
  Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
  Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
 2013-01-10 13:34:31 -08:00
Igor Murashkin
10665f4b0c Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev 2013-01-10 13:34:27 -08:00
Igor Murashkin
778dd967ad Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev 2013-01-10 13:34:20 -08:00
Igor Murashkin
6daf70b26b Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev 2013-01-10 13:34:12 -08:00
Igor Murashkin
68ade37943 Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE 
Change-Id: I36c3dcaaecd9bca495c1476841a0ae338019e7eb
 2013-01-10 11:58:14 -08:00
Igor Murashkin
74d45ce6f3 Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE 
Change-Id: I12d960debb499795487582655243e951b15947d5
 2013-01-10 11:58:14 -08:00
Igor Murashkin
04ff9ec118 Camera2: Fix a deadlock when closing the camera: DO NOT MERGE 
Change-Id: I15dcf719aae4ed0dd3a46150ecba54ed6a7f31f5
 2013-01-10 11:58:14 -08:00
Igor Murashkin
95f1b7e72e Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE 
Change-Id: I7574913a5e2b5d1bcdfede11d99a212ef01a8697
 2013-01-10 11:58:14 -08:00
Igor Murashkin
50a86be055 Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE 
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: I8db9d918e7773ccb1eece860b461aa0192782a3b
 2013-01-10 11:58:14 -08:00
Igor Murashkin
0bddddb04d Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE 
Change-Id: I37e2c005607548c47e34e7e09994894a69f9e955
 2013-01-10 11:58:14 -08:00
Igor Murashkin
52f92faa60 Camera2: Selectively re-define master metadata symbols: DO NOT MERGE 
Change-Id: I0d8637362f407dc2e2809d5800c9667f3c15260b
 2013-01-10 11:58:06 -08:00
The Android Automerger
c66b768110 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-10 11:56:44 -08:00
Adam Koch
15493fd9c3 am 784be44a: am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies 
* commit '784be44a77ce4ec19824377260d93783071fd053':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies
 2013-01-10 06:32:07 -08:00
Adam Koch
784be44a77 am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies 
* commit 'a1d11945fdfde5c85f4dd18d2ddcecdbf7442da2':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies
 2013-01-10 06:29:29 -08:00
Adam Koch
a1d11945fd am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies 
* commit '6acfaccc5078e55a63d1c500bc0c28d432407e9e':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies
 2013-01-10 06:26:41 -08:00
The Android Automerger
006b895c2c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-09 15:47:28 -08:00
Adam Koch
6acfaccc50 Bitmapfun Sample: Fix inSampleSize selection and update dependencies 
When computing inSampleSize, calculateInSampleSize() needs to compare
height/width ratios, rather than raw values.

Also updating support library JAR to latest version.

Bug: 7951398
Change-Id: Id15dbcc105bbd2bbf8e03883aeba780da6f807eb
 2013-01-09 16:12:52 -05:00
Andrew Hsieh
d75ec23e46 am 02faddde: am 14b0ab7a: Merge "Sync stddef.h" 
* commit '02faddde0de758ad6804e147bd808f8b1696073a':
  Sync stddef.h
 2013-01-09 05:38:45 -08:00
Andrew Hsieh
02faddde0d am 14b0ab7a: Merge "Sync stddef.h" 
* commit '14b0ab7a466d509b39528a366c78d182f5a95ace':
  Sync stddef.h
 2013-01-09 04:25:10 -08:00
Andrew Hsieh
14b0ab7a46 Merge "Sync stddef.h" 2013-01-09 04:12:26 -08:00
Andrew Hsieh
bbff7fbd64 Sync stddef.h 
To be the same as bionic's.  See
ec37237d69289e2bb9836bfa0d071ab958234d00

The new one also no longer undef offsetof and replaces it with
"((size_t) &((TYPE *)0)->MEMBER)" if __compiler_offsetof isn't
defined.  The problem with the old behavior are that
1. __compiler_offsetof isn't defined in linux/compiler.h even though
   all Android compilers support __builtin_offsetof
2. As as result, offsetof defined in stddef.h to use __builtin_offsetof
   is undefined and replaced here.  Problem is,
   "((size_t) &((TYPE *)0)->MEMBER)" isn't considered a compile-time
   constant, and fails some code expect offsetof to be.

Change-Id: I3ebb0de9e1d95305a0890a099360ff6936d24b2f
 2013-01-09 17:33:13 +08:00
Andrew Hsieh
80fc9e5325 am 888c33e7: am 7d6e4794: Merge "Sync MIPS fenv.h" 
* commit '888c33e771b6e3ffbaffbdec14a1475fb9083e39':
  Sync MIPS fenv.h
 2013-01-08 18:16:41 -08:00
Andrew Hsieh
bc8fa78f03 am e9fac40c: am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1" 
* commit 'e9fac40cee0316a18fb37eb7100cabfdaa8ccb2c':
  Fix san-sangeles warnings with clang 3.1
 2013-01-08 18:16:40 -08:00
Andrew Hsieh
888c33e771 am 7d6e4794: Merge "Sync MIPS fenv.h" 
* commit '7d6e479464be322f0d3786127c5eb4640713a38b':
  Sync MIPS fenv.h
 2013-01-08 18:14:15 -08:00
Andrew Hsieh
e9fac40cee am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1" 
* commit 'aa7d994e37a3e697048a46a94b0ba4894332c698':
  Fix san-sangeles warnings with clang 3.1
 2013-01-08 18:14:14 -08:00
Andrew Hsieh
7d6e479464 Merge "Sync MIPS fenv.h" 2013-01-08 18:06:48 -08:00
Andrew Hsieh
aa7d994e37 Merge "Fix san-sangeles warnings with clang 3.1" 2013-01-08 18:04:36 -08:00
Derek Sollenberger
dd2ab662b7 Remove unsupported BrowserPlugin. 
Change-Id: Id163f56788f1e02b90a95dfb89b4cd0462aa0cbd
 2013-01-08 13:21:12 -05:00
Andrew Hsieh
ec20b2d476 Fix san-sangeles warnings with clang 3.1 
about implicit declaration of functions appInit, appDeinit,
appRender, and importGLInit

Change-Id: Iaaaa49dd8de0e82bcb59be0b08cb490647f06dde
 2013-01-08 19:15:07 +08:00
Andrew Hsieh
253d234a29 Sync MIPS fenv.h 
See d199017101dd124204fb949e46adb68a43e4785b

Change-Id: I657a8a4df26868bcf9cdab0dc0063c56bc085a85
 2013-01-08 10:59:06 +08:00
Katie McCormick
7ca2ee364e am b66af3b7: am 7c704705: am 1f152439: am 65cc8b78: Network sample: fix typo in manifest 
* commit 'b66af3b789bb724d00694af54500b71591ed3268':
  Network sample: fix typo in manifest
 2013-01-04 17:51:05 -08:00
Katie McCormick
b66af3b789 am 7c704705: am 1f152439: am 65cc8b78: Network sample: fix typo in manifest 
* commit '7c704705ea2516fce940d1531715c7fdc83f6d42':
  Network sample: fix typo in manifest
 2013-01-04 16:40:36 -08:00
Katie McCormick
7c704705ea am 1f152439: am 65cc8b78: Network sample: fix typo in manifest 
* commit '1f1524395dcfd616396b47f98eed0daf02635fa0':
  Network sample: fix typo in manifest
 2013-01-04 16:38:28 -08:00
Katie McCormick
1f1524395d am 65cc8b78: Network sample: fix typo in manifest 
* commit '65cc8b78a8a3594911772c665d77fd6030d9fd51':
  Network sample: fix typo in manifest
 2013-01-04 16:35:53 -08:00
Katie McCormick
65cc8b78a8 Network sample: fix typo in manifest 
Change-Id: I5731dbb89d17bd15bc72a2f140bca2915976b4c1
 2013-01-04 16:04:23 -08:00
Andrew Hsieh
3a49a3c1a9 am 843f237b: am d3bce3f1: am 8e84a15f: Merge "Sync sys/limits.h and sys/sysconf.h" 
* commit '843f237ba0da16dbad8a897acbe4a360661a1533':
  Sync sys/limits.h and sys/sysconf.h
 2013-01-03 11:00:54 -08:00
Andrew Hsieh
4457c80d2c am dc7edc87: am 0c262558: am 6d2a832f: Merge "Sync fenv.h" 
* commit 'dc7edc872b0cd07c563d97d8b66daacc5020f92f':
  Sync fenv.h
 2013-01-03 11:00:52 -08:00
Andrew Hsieh
843f237ba0 am d3bce3f1: am 8e84a15f: Merge "Sync sys/limits.h and sys/sysconf.h" 
* commit 'd3bce3f109277c2770af2f59bd41b0b1db9e91b7':
  Sync sys/limits.h and sys/sysconf.h
 2013-01-03 10:58:53 -08:00
Andrew Hsieh
dc7edc872b am 0c262558: am 6d2a832f: Merge "Sync fenv.h" 
* commit '0c2625587b262d8dbc338f85b2ee882779e28370':
  Sync fenv.h
 2013-01-03 10:58:51 -08:00
Andrew Hsieh
d3bce3f109 am 8e84a15f: Merge "Sync sys/limits.h and sys/sysconf.h" 
* commit '8e84a15fedf5bc0627f7ccea227a88d1cad90252':
  Sync sys/limits.h and sys/sysconf.h
 2013-01-03 10:55:45 -08:00
Andrew Hsieh
0c2625587b am 6d2a832f: Merge "Sync fenv.h" 
* commit '6d2a832fec161297d5d96ae1f9868b2bce83b2ca':
  Sync fenv.h
 2013-01-03 10:55:44 -08:00
Andrew Hsieh
8e84a15fed Merge "Sync sys/limits.h and sys/sysconf.h" 2013-01-03 10:34:13 -08:00