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
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
Stephen Hines
0e72fe1adb Update HelloCompute to use separate output bitmap. 
Change-Id: I236d35b1ce41099dcd18389983d694982f1c7f6c
 2012-12-07 11:24:52 -08:00
Andrew Hsieh
3f6f6a8844 am 7d5a4faa: am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1" 
* commit '7d5a4faacecda23d6d7c7c8c622c34dd4fc90457':
  Fix warning compiling samples with clang3.1
 2012-12-06 11:01:30 -08:00
Andrew Hsieh
64031cb68b am 83c6e0c2: am aa33ae38: Merge "Refresh endian.h" 
* commit '83c6e0c28526908081ab39390f5f41e5fba64491':
  Refresh endian.h
 2012-12-06 11:01:29 -08:00
Andrew Hsieh
7d5a4faace am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1" 
* commit '0f30dd0d198b9806239c366ae327f6b83bcdd396':
  Fix warning compiling samples with clang3.1
 2012-12-06 10:59:15 -08:00
Andrew Hsieh
83c6e0c285 am aa33ae38: Merge "Refresh endian.h" 
* commit 'aa33ae38aee7be1acea5259332aea7954d7fa6e8':
  Refresh endian.h
 2012-12-06 10:59:06 -08:00
Andrew Hsieh
0f30dd0d19 Merge "Fix warning compiling samples with clang3.1" 2012-12-06 04:51:55 -08:00
Andrew Hsieh
4ba2dd5080 Fix warning compiling samples with clang3.1 
Change-Id: I166cc64d34dcf8dd99fc28f2556306b8795e3c7e
 2012-12-06 18:10:46 +08:00
Andrew Hsieh
aa33ae38ae Merge "Refresh endian.h" 2012-12-05 21:28:13 -08:00
Dianne Hackborn
613e19b740 SDK Only: Fix search interaction with various samples. 
These were broken where pressing back would not clear the
search filter.

Change-Id: Iafd4a497a31a9689efabe7d92f44618a5e8dc80c
 2012-12-05 15:17:31 -08:00
Andrew Hsieh
d715dedb42 am 69f82457: am 25be7400: Merge "Fix a ENOTUP/ENOTSUP typo" 
* commit '69f82457bd66ada421cbdce1bab8993a66f5ba97':
  Fix a ENOTUP/ENOTSUP typo
 2012-12-05 13:00:36 -08:00
John Spurlock
34bdeed8c4 Merge "Add "cts-dreams" to testrunner." 2012-12-05 06:51:39 -08:00
Andrew Hsieh
69f82457bd am 25be7400: Merge "Fix a ENOTUP/ENOTSUP typo" 
* commit '25be7400a9b0cf205a2188663e137610feb12111':
  Fix a ENOTUP/ENOTSUP typo
 2012-12-05 06:05:04 -08:00
Andrew Hsieh
25be7400a9 Merge "Fix a ENOTUP/ENOTSUP typo" 2012-12-05 05:03:32 -08:00
Andrew Hsieh
ef48154850 Fix a ENOTUP/ENOTSUP typo 
See ecb53eab4b63a777c189f880e7f88ebbe0e8101b

Change-Id: Id0cd72f3ccc6e4ecb1bd57045e2f46be234378fa
 2012-12-05 13:05:15 +08:00
Andrew Hsieh
7361c3c7bb Refresh endian.h 
See http://code.google.com/p/android/issues/detail?id=39824
and b15c58bb0fe55f076751acd7a5d00ded0ec33963

Change-Id: I71858f6d15adb688e0b05685e55582f0f1ddae54
 2012-12-05 12:42:18 +08:00
Igor Murashkin
53db6a1a21 Merge "EmulatedCamera2: Fix metadata symbols" 2012-12-04 17:26:39 -08:00
John Spurlock
8197f7db4a Add "cts-dreams" to testrunner. 
Change-Id: If743bea114ad38a15f65f4b3d309a2dad6bde313
 2012-12-04 17:13:11 -05:00
Andrew Hsieh
0acd271891 am d39deac4: am d613956f: Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 
* commit 'd39deac4a664121bae98806f262857b59d46ddc7':
  Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86
 2012-12-04 10:58:09 -08:00
Andrew Hsieh
d39deac4a6 am d613956f: Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 
* commit 'd613956fdff6250aa9f143b84332c840224608db':
  Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86
 2012-12-04 10:56:40 -08:00
Andrew Hsieh
d613956fdf Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86" 2012-12-04 10:50:09 -08:00
Andrew Hsieh
c45fca2926 Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86 
SL_IID_ANDROIDBUFFERQUEUESOURCE is new in android-14 and already
declared in platforms/android-14/include/SLES/OpenSLES_Android.h,
but it's missing from libOpenSLES.so

It turns out both *.functions.txt and *.variables.txt should exist
for gen-platforms.sh to generate new *.so.  Add *.functions.txt otherwise
development/ndk/platforms/android-14/arch-(arm|x86)/symbols/libOpenSLES.so.variables.txt
are ignored.  Note that MIPS is correct all along.

See http://code.google.com/p/android/issues/detail?id=40625

Change-Id: I826f13a93c9f3eaf648a59e7e844b53be5f7fba0
 2012-12-04 20:23:41 +08:00
The Android Open Source Project
73ab2652a7 am 98b6d047: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '98b6d04739521edc2d0ffe02a41eaf074e3e1fa5':
 2012-12-03 11:36:39 -08:00
The Android Open Source Project
98b6d04739 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1f1dd624a0e8cb1fd8b767acfccd092f6b81230e
 2012-12-03 11:34:03 -08:00
The Android Automerger
5ef16dab70 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-03 06:06:29 -08:00
Dirk Dougherty
4167988cdb am 7bac2b5d: am 81c152c6: am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. 
* commit '7bac2b5dd6c7115f4b7f73fda96b5d66a5471f41':
  Redirects /guide/google to /google/.
 2012-12-02 18:01:55 -08:00
Dirk Dougherty
7bac2b5dd6 am 81c152c6: am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. 
* commit '81c152c6185a49b65067423c95a5ca59fe744808':
  Redirects /guide/google to /google/.
 2012-12-02 17:59:59 -08:00
Dirk Dougherty
81c152c618 am 51b6b20f: am 6d198012: Redirects /guide/google to /google/. 
* commit '51b6b20fe6feeb0152481ccf810e98b691970075':
  Redirects /guide/google to /google/.
 2012-12-02 17:58:47 -08:00
Dirk Dougherty
51b6b20fe6 am 6d198012: Redirects /guide/google to /google/. 
* commit '6d198012a9150521c08af28c669b5b589f0465ac':
  Redirects /guide/google to /google/.
 2012-12-02 17:56:36 -08:00
Dirk Dougherty
6d198012a9 Redirects /guide/google to /google/. 
Change-Id: I5018200bb8717e69d2485ce4d1b8804a1d90e2c8
 2012-12-02 17:25:10 -08:00
Romain Guy
58e2715424 Merge "Fix stack tool to find the correct toolchain" 2012-11-30 15:01:49 -08:00
Romain Guy
fdc3519cd7 Fix stack tool to find the correct toolchain 
Change-Id: Ie525b286a4d133512c72b234f03e54f8635c15ee
 2012-11-30 14:56:39 -08:00
Igor Murashkin
328bdf979a EmulatedCamera2: Fix metadata symbols 
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
 2012-11-30 14:13:09 -08:00
Xavier Ducrohet
39460fa3ec am dcabeb6e: am ff32ac93: am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 
* commit 'dcabeb6e777d35e54c92e1c5307aa0904aabf424':
  Move plat-tools SDK component rev to 16.0.1
 2012-11-30 14:03:26 -08:00
Xavier Ducrohet
dcabeb6e77 am ff32ac93: am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 
* commit 'ff32ac932704748227b11a82e4d2b59734e85f05':
  Move plat-tools SDK component rev to 16.0.1
 2012-11-30 14:01:35 -08:00
Xavier Ducrohet
ff32ac9327 am 8325f80b: am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 
* commit '8325f80ba4489b7a66f8c81fef47104e7f1c0625':
  Move plat-tools SDK component rev to 16.0.1
 2012-11-30 13:59:01 -08:00
Xavier Ducrohet
8325f80ba4 am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1 
* commit '0e61ea6f3967846d0796d533f98cad0fb91f3d3d':
  Move plat-tools SDK component rev to 16.0.1
 2012-11-30 13:57:31 -08:00