LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,272 Commits 2 Branches 0 Tags
bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc
Commit Graph

13272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Hsieh
6d2a832fec Merge "Sync fenv.h" 2013-01-03 10:33:50 -08:00
Andrew Hsieh
75d889ea23 Sync sys/limits.h and sys/sysconf.h 
See http://code.google.com/p/android/issues/detail?id=39680
and a55f63083fb16b2595f517a3260083e5f8cddd02

Change-Id: I2d1548814eb771c26b540f5fee57dabf54fcfdd6
 2013-01-03 12:28:48 +08:00
Andrew Hsieh
d693e84421 Sync fenv.h 
See See 0f7809d5c364565e210554ca2b5d8eedf8a57ec7
90e10d41c4271a5d517f60f4ff1d2891b8ccc034

Change-Id: Id59b6c24f74f03f7d4b0c420fdb59fb2ab98be0d
 2013-01-03 12:12:39 +08:00
Xavier Ducrohet
da3e577b47 am 35fc8255: am 8b6b233a: am 07d73623: am bf323d72: Update platform tools rev to 16.0.2 
* commit '35fc8255c0470776961cd28fceb2b0261bf8d20a':
  Update platform tools rev to 16.0.2
 2013-01-02 16:34:26 -08:00
Xavier Ducrohet
35fc8255c0 am 8b6b233a: am 07d73623: am bf323d72: Update platform tools rev to 16.0.2 
* commit '8b6b233a8b11bd3182f2971a957206c60da036b6':
  Update platform tools rev to 16.0.2
 2013-01-02 13:06:16 -08:00
Xavier Ducrohet
8b6b233a8b am 07d73623: am bf323d72: Update platform tools rev to 16.0.2 
* commit '07d7362394270401227575a7c00a555b7f9e6147':
  Update platform tools rev to 16.0.2
 2013-01-02 13:03:23 -08:00
Xavier Ducrohet
07d7362394 am bf323d72: Update platform tools rev to 16.0.2 
* commit 'bf323d72b7db944a4a0c8794f28e03367abd8c99':
  Update platform tools rev to 16.0.2
 2013-01-02 13:00:56 -08:00
Xavier Ducrohet
bf323d72b7 Update platform tools rev to 16.0.2 
Change-Id: I814294bc9374f6194671eb173bd9942908db3848
 2013-01-02 12:28:36 -08:00
Andrew Hsieh
4966cb2f15 am 86165d9c: am 8df02abd: Merge "Add binaries to bootstrap GCC build with OpenMP" 
* commit '86165d9c6778053f6f8539df3885716b67f83846':
  Add binaries to bootstrap GCC build with OpenMP
 2012-12-28 09:48:51 -08:00
Andrew Hsieh
aef2b16667 am 6b00756c: am 2d52182d: Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9" 
* commit '6b00756c8cd0631820911bde1a1f5529787e262a':
  Fix wint_t in android-3 and android-8 to be consistent with android-9
 2012-12-28 09:48:29 -08:00
Andrew Hsieh
dedc755d5a am 2293b51c: am 9a204c55: Merge "Remove duplicated definitions of size_t and ssize_t" 
* commit '2293b51c64b75d3b6cdbdc4d0f5d790ef89ec55f':
  Remove duplicated definitions of size_t and ssize_t
 2012-12-28 09:48:05 -08:00
Andrew Hsieh
86165d9c67 am 8df02abd: Merge "Add binaries to bootstrap GCC build with OpenMP" 
* commit '8df02abd897f1cd3eafae907cce64c9091a6f27e':
  Add binaries to bootstrap GCC build with OpenMP
 2012-12-27 05:24:37 -08:00
Andrew Hsieh
8df02abd89 Merge "Add binaries to bootstrap GCC build with OpenMP" 2012-12-27 04:03:06 -08:00
Andrew Hsieh
54e2794aba Add binaries to bootstrap GCC build with OpenMP 
With --enable-libgomp, gcc/gcc-4.4.3/libiberty/configure line #2124 tries
to link a trivial program but fails w/o the presence of libc.so and libdl.so
and sets "gcc_no_link=yes" at line #2131.  Confiugre later fails with
cryptic message reads "Link tests are not allowed after GCC_NO_EXECUTABLES."

See
  https://android-review.googlesource.com/#/c/34491, 48617, and 48619

Change-Id: I6e761c5fb12f413dca04a26b39f27e9f026d75d3
 2012-12-26 15:11:56 +08:00
Andrew Hsieh
6b00756c8c am 2d52182d: Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9" 
* commit '2d52182dfac91014c2975a1bb1afd99a3b14b4e9':
  Fix wint_t in android-3 and android-8 to be consistent with android-9
 2012-12-23 22:54:16 -08:00
Andrew Hsieh
2d52182dfa Merge "Fix wint_t in android-3 and android-8 to be consistent with android-9" 2012-12-23 22:42:57 -08:00