LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,747 Commits 2 Branches 0 Tags
21c4a88a26c79c7a970ca0fd01e635ce82dd82a6
Commit Graph

16747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
a6e8e0d8fb Merge "Remove dependencies on FloatMath" 2014-10-15 10:27:19 +00:00
Tadashi G. Takaoka
97f11e1c34 (DO NOT MERGE) Fix sample SoftKeyboard preference activity 
(cherry picked from Master, commit 8359ac20a5)

Bug: 17887760
Change-Id: Ibe7d1f2b9189ecee7867a2448790eddb151bd61a
 2014-10-15 09:19:12 +00:00
Andrew Hsieh
b848a811c2 am 14576ee4: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit '14576ee4b62f5b195d6676387898363e9b32c27e':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:29:05 +00:00
Andrew Hsieh
36afc8d4ac am dcb2dcb7: am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit 'dcb2dcb74522046688a2003926a38d4f2cbfa84d':
  Rename android-L to android-21
 2014-10-15 03:28:37 +00:00
Andrew Hsieh
8e41a8395b am dcebc2f1: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit 'dcebc2f1d850c50c203417ee227833f3609c0c2c':
  Add missing function prototypes in time.h
 2014-10-15 03:28:21 +00:00
Andrew Hsieh
d8338a7e26 Add asm/a.out.h to arm64/mips/mips64 
The common header include/linux/a.out.h include asm/a.out.h, but
arm64/mips/mips64 don't have it.  Add a placeholder before bionic
has it

Change-Id: I7084e0beabe86fec32987a89e66d6c094f1e8c22
 2014-10-15 11:13:01 +08:00
Andrew Hsieh
d6bf7265b3 am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'e6a62f6052e3e9b337ca9857117e751853bae6df':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:10:51 +00:00
Andrew Hsieh
14576ee4b6 am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'e6a62f6052e3e9b337ca9857117e751853bae6df':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:10:48 +00:00
Andrew Hsieh
c810b3ce7a Remove macros putc*/getc* from API<21 stdio.h to use 
Macros putc, getc and their unlock cousins use internal functions and
variables not necessarily available in future libc.so (*1).  Remove macros
and use functions aleady exists in libc.so instead.

(*1) https://android-review.googlesource.com/#/c/110662/

Change-Id: I3faa2d74de40ef8376119b38f2a39d46ece47d07
 2014-10-15 11:09:47 +08:00
Andrew Hsieh
e6a62f6052 am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'dc942b9c64fa132825e4945129339c1e954f5cfb':
  Make memory_order_acquire visible in global namespace
 2014-10-15 03:07:21 +00:00
Andrew Hsieh
64724bcca3 am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit '0d8795135d1c5ddfcba86cf356c53b0a466e58ca':
  Rename android-L to android-21
 2014-10-15 03:07:11 +00:00
Andrew Hsieh
dcb2dcb745 am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit '0d8795135d1c5ddfcba86cf356c53b0a466e58ca':
  Rename android-L to android-21
 2014-10-15 03:07:04 +00:00
Andrew Hsieh
2437e141fe Change sample native-codec's minSDK to android-21 
android-L is renamed as android-21 in both coming SDK and NDK

Change-Id: I57b0dbe4d6e8add178dadfa6306bfc40aad27206
 2014-10-15 11:03:55 +08:00
Andrew Hsieh
0d8795135d am 106046ae: Merge "Rename android-L to android-21" 
* commit '106046ae9ef3b6a3f6659503f66338d02083d282':
  Rename android-L to android-21
 2014-10-15 03:03:17 +00:00
Andrew Hsieh
2a01c3f3f9 am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit '93dd2f8a29c6b30a902db4136eec465c704fe380':
  Add missing function prototypes in time.h
 2014-10-15 03:02:18 +00:00
Andrew Hsieh
dcebc2f1d8 am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit '93dd2f8a29c6b30a902db4136eec465c704fe380':
  Add missing function prototypes in time.h
 2014-10-15 03:02:17 +00:00
Andrew Hsieh
dc942b9c64 Merge "Make memory_order_acquire visible in global namespace" 2014-10-15 03:01:43 +00:00
Hans Boehm
1b2269becc Make memory_order_acquire visible in global namespace 
We were missing that using directive when including <atomic>.

Bug:17736764

Change-Id: I93673dc60cca47195ff7bd651840c77255fb2d4a
 2014-10-15 11:00:28 +08:00
Andrew Hsieh
93dd2f8a29 am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit 'b02b4bced417d38f547f874b4f425270decc2e61':
  Add missing function prototypes in time.h
 2014-10-15 02:59:13 +00:00
Andrew Hsieh
106046ae9e Merge "Rename android-L to android-21" 2014-10-15 02:51:14 +00:00
Andrew Hsieh
da84168fb2 Rename android-L to android-21 
Change-Id: I1e781b15a867cf6283756f35f2b5955c96637c39
 2014-10-15 10:48:04 +08:00
Andrew Hsieh
b02b4bced4 Merge "Add missing function prototypes in time.h" 2014-10-15 02:44:06 +00:00
Haruki Hasegawa
13af1d8c37 Add missing function prototypes in time.h 
Add clock_settime() and clock_nanosleep() function
prototypes in time.h.

Change-Id: I0eb45e465b3b48b9d4f3a4a8109a6f2d9c4f8ce2
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
 2014-10-15 10:42:24 +08:00
Yigit Boyar
e70d01bbf5 Add color picker to cardview demo 
Bug: 17668891
Change-Id: Id54bae8e37ffb4d1f077ca4ef9a721766277c02e
 2014-10-14 12:31:08 -07:00
Trevor Johns
9ce01dbdeb am 030c8097: am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '030c8097527655dbbf10aa9f07d50c9975cb4ecb':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-10 18:42:27 +00:00
Trevor Johns
030c809752 am 913f8146: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '913f814641732ac243f823431d3dfeac2a6e646f':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-10 17:00:22 +00:00
Trevor Johns
913f814641 am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '569e9febc5c91d92459579e32df7b948d3e32dff':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 19:23:24 +00:00
Trevor Johns
85e87c555a am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '569e9febc5c91d92459579e32df7b948d3e32dff':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 12:51:10 +00:00
Trevor Johns
569e9febc5 am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '679920d8091c0fb10e68667f158b9e18a77689fa':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 01:24:03 +00:00
Trevor Johns
679920d809 Merge commit '3992ec56' into klp-modular-dev 
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.

Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
 2014-10-08 17:41:47 -07:00
Tadashi G. Takaoka
108ba55faf Merge "Fix sample SoftKeyboard preference activity" 2014-10-08 15:26:59 +00:00
Chenjie Luo
5e7ee8ae9b am d47b5cee: am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit 'd47b5cee8212d41a546d332c7949468537c8aa03':
  Update test runner for cts tests in testrunner/test_defs.xml
 2014-10-08 13:14:53 +00:00
Chenjie Luo
d47b5cee82 am 9ac2afe4: am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit '9ac2afe4cef95ed49903ac64b3d57b80aa055c3c':
  Update test runner for cts tests in testrunner/test_defs.xml
 2014-10-08 07:52:08 +00:00
Chenjie Luo
9ac2afe4ce am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit '88fbf1fe733a5332f1a2ba44253b46a20fed1e6f':
  Update test runner for cts tests in testrunner/test_defs.xml
 2014-10-08 05:24:56 +00:00
Chenjie Luo
950879ac33 am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit '88fbf1fe733a5332f1a2ba44253b46a20fed1e6f':
  Update test runner for cts tests in testrunner/test_defs.xml
 2014-10-08 00:07:45 +00:00
Chenjie Luo
88fbf1fe73 Update test runner for cts tests in testrunner/test_defs.xml 
Bug: 17885115

Change-Id: I2f95d9964bf152fb1b609e0c878eea1cb096f76f
 2014-10-07 15:39:55 -07:00
Ruben Brunk
626cf05e7e Merge "idegen: Skip directories named *.java when parsing source." 2014-10-07 20:16:43 +00:00
Tor Norbye
805dc43b1c am 1181e941: am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit '1181e941932c20cf5a7b7b284694a12942df563b':
  Bug 17782530: Annotations using retention policy source remain in .class
 2014-10-07 01:38:10 +00:00
Tor Norbye
1181e94193 am 3f75a9a0: am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit '3f75a9a0341599c228592895fe49527964b52dbf':
  Bug 17782530: Annotations using retention policy source remain in .class
 2014-10-07 01:32:32 +00:00
Tor Norbye
3fa7b69db6 am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit '3b2fe7eb9cab88d3957794cb0f14ddc10a57dc29':
  Bug 17782530: Annotations using retention policy source remain in .class
 2014-10-07 01:27:25 +00:00
Tor Norbye
3f75a9a034 am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit '3b2fe7eb9cab88d3957794cb0f14ddc10a57dc29':
  Bug 17782530: Annotations using retention policy source remain in .class
 2014-10-07 01:22:17 +00:00
Tor Norbye
3b2fe7eb9c Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 2014-10-07 01:07:25 +00:00
Deepanshu Gupta
b4fc9e52ca am 9fabccbf: am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12. 
* commit '9fabccbf9b4ac7368dab77596c722b82accb8608':
  Update LayoutLib API level to 12.
 2014-10-07 01:04:05 +00:00
Deepanshu Gupta
9fabccbf9b am e5a9f9d0: am 2c34d62a: Update LayoutLib API level to 12. 
* commit 'e5a9f9d066a7464a9d25d679c101c60fee03459a':
  Update LayoutLib API level to 12.
 2014-10-07 00:55:37 +00:00
Tadashi G. Takaoka
8359ac20a5 Fix sample SoftKeyboard preference activity 
Bug: 17887760
Change-Id: Ibe7d1f2b9189ecee7867a2448790eddb151bd61a
 2014-10-07 09:52:18 +09:00
Deepanshu Gupta
e5a9f9d066 am 2c34d62a: Update LayoutLib API level to 12. 
* commit '2c34d62a0c53c45f10bb834fb9e0b910c63b7fd4':
  Update LayoutLib API level to 12.
 2014-10-07 00:20:33 +00:00
Deepanshu Gupta
e1a3f47e5e am 2c34d62a: Update LayoutLib API level to 12. 
* commit '2c34d62a0c53c45f10bb834fb9e0b910c63b7fd4':
  Update LayoutLib API level to 12.
 2014-10-06 23:50:21 +00:00
Deepanshu Gupta
2c34d62a0c Update LayoutLib API level to 12. 
Change-Id: I7e392515939728251424d44d5957f95bdf3eb741
 2014-10-06 16:39:12 -07:00
Tor Norbye
b6b7487e23 Bug 17782530: Annotations using retention policy source remain in .class 
Change-Id: I763e99c243d85406162e3b898fe1e5af8c216173
 2014-10-06 16:21:36 -07:00
Christopher Ferris
353882755a am 8aa117a3: am 9329e4f0: am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev 
* commit '8aa117a3b0f7a0c87830a09c73dc2e44c757ded1':
  Do not call art-on macro by default.
 2014-10-05 19:40:42 +00:00