LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,480 Commits 2 Branches 0 Tags
d25bf1efdd7c3d94d319930568c908a1dfb5edab
Commit Graph

14480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
cf1590683f am 1b10ec48: am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN" 
* commit '1b10ec48185f644022530d94c25fa074ab7ec61f':
  Track transition from SIGRTMIN to __SIGRTMIN
 2014-05-01 01:30:51 +00:00
Andrew Hsieh
1b10ec4818 am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN" 
* commit 'fc30ef32c781970fc05b3753152cee459c51ce0e':
  Track transition from SIGRTMIN to __SIGRTMIN
 2014-05-01 01:28:41 +00:00
Andrew Hsieh
fc30ef32c7 am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN" 
* commit '4d8f4793cdc9804e582805a22cfcd94343f8d9cc':
  Track transition from SIGRTMIN to __SIGRTMIN
 2014-05-01 01:24:57 +00:00
Andrew Hsieh
4d8f4793cd am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN" 
* commit '261d178e55db870331bd5eb8a41a22aa8f6c3589':
  Track transition from SIGRTMIN to __SIGRTMIN
 2014-05-01 01:22:48 +00:00
Andrew Hsieh
261d178e55 Merge "Track transition from SIGRTMIN to __SIGRTMIN" 2014-05-01 01:20:04 +00:00
Brian Carlstrom
fb9c4e0c9f Track transition from SIGRTMIN to __SIGRTMIN 
Change-Id: I69064edf1a7e95c91f90d9b05c1cf3f9c8c46747
 2014-04-30 17:58:41 -07:00
Dave Platt
192aa872c0 am 1dd16c67: Merge "Update sample NSD app to work reliably with current Android" 
* commit '1dd16c67e9b3bb1445823d948fc0300fc4f150f6':
  Update sample NSD app to work reliably with current Android
 2014-04-30 23:45:27 +00:00
Dave Platt
1dd16c67e9 Merge "Update sample NSD app to work reliably with current Android" 2014-04-30 23:39:27 +00:00
Tim Kilbourn
b941ab64e8 am d810db81: Merge "Set row heights for browse rows." 
* commit 'd810db8136c0c0978a116709612df415d450b814':
  Set row heights for browse rows.
 2014-04-30 19:31:43 +00:00
Tim Kilbourn
d810db8136 Merge "Set row heights for browse rows." 2014-04-30 19:23:06 +00:00
Chiao Cheng
e5e49cbbac am e2962681: Merge "Overhaul of intellij-gen script." 
* commit 'e2962681b6f73dba3ff2ac7e63a6f70901fc1751':
  Overhaul of intellij-gen script.
 2014-04-30 18:09:33 +00:00
Chiao Cheng
e2962681b6 Merge "Overhaul of intellij-gen script." 2014-04-30 18:07:29 +00:00
Tim Kilbourn
6044578753 Set row heights for browse rows. 
Set a size on the text_bg so the cards appear at the correct size.

Change-Id: Ic2a836431485aaaea922a6bb3868e3e937f1ec21
 2014-04-30 09:42:26 -07:00
The Android Automerger
931fb57310 merge in master-release history after reset to 9dc9ca97a5 2014-04-30 05:49:34 -07:00
Bill Yi
7830daee26 am 9dc9ca97: am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD 
* commit '9dc9ca97a54246b59ff3189d7e5adf8f3437d5c7':
 2014-04-30 00:57:18 +00:00
Bill Yi
9dc9ca97a5 am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD 
* commit 'b5255dabc0131f907c607a79f08c8bc9ea92551f':
 2014-04-30 00:53:04 +00:00
Bill Yi
b5255dabc0 am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD 
* commit '23f68632c7f1a368bcc471b9b782f29fb32619ca':
 2014-04-30 00:49:29 +00:00
George Mount
010daa9678 am 69ac8ef1: Add new sample transition XML. 
* commit '69ac8ef1c41789ee999503d7214563a39c9ea14f':
  Add new sample transition XML.
 2014-04-29 20:58:33 +00:00
George Mount
69ac8ef1c4 Add new sample transition XML. 
Change-Id: Iab0dc6f1533a2d841ff3edbda24535ba17184c7c
 2014-04-29 13:46:56 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
The Android Automerger
7d0c6de502 merge in master-release history after reset to 04c85ceee7 2014-04-29 05:49:31 -07:00
Tim Kilbourn
962953dba4 am 04c85cee: Minor card tweaks for leanback demo. 
* commit '04c85ceee7b3955fbbb8ba1e438541ade88e7279':
  Minor card tweaks for leanback demo.
 2014-04-28 22:33:58 +00:00
Tim Kilbourn
04c85ceee7 Minor card tweaks for leanback demo. 
- Set card size to 160x100
- Show 10 rows

Change-Id: I440eef119250d3385ce5d367ec231bfe7c0201b4
 2014-04-28 15:23:48 -07:00
Andrew Hsieh
ac40154598 am be0a44ea: am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 
* commit 'be0a44eaf76193a23362ef8449adc50ef9e3ecce':
  Bump __clang_minor__ check to 6 for __builtin_isnan
 2014-04-28 17:13:46 +00:00
Andrew Hsieh
be0a44eaf7 am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 
* commit 'cb606e1fe286507f17d35373e6b8cb295c27eeee':
  Bump __clang_minor__ check to 6 for __builtin_isnan
 2014-04-28 17:11:12 +00:00
Andrew Hsieh
cb606e1fe2 am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 
* commit '88765facf16ad4887bf6a1c91c64839ecda9d081':
  Bump __clang_minor__ check to 6 for __builtin_isnan
 2014-04-28 17:05:58 +00:00
Andrew Hsieh
88765facf1 am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 
* commit 'e23f9c5d308c0499c442cbd0bb07d336471dcb88':
  Bump __clang_minor__ check to 6 for __builtin_isnan
 2014-04-28 17:02:31 +00:00
Andrew Hsieh
e23f9c5d30 Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 2014-04-28 16:59:32 +00:00
The Android Automerger
59b80c2e8d merge in master-release history after reset to 44e89d3e2f 2014-04-28 05:49:19 -07:00
The Android Automerger
88b7a7afb7 merge in master-release history after reset to 44e89d3e2f 2014-04-27 05:49:17 -07:00
The Android Automerger
2100ad74b5 merge in master-release history after reset to 44e89d3e2f 2014-04-26 05:49:45 -07:00
Jim Miller
5f787dde44 am 44e89d3e: Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents" 
* commit '44e89d3e2fc136f52fcdd9e0ab4384f2a744d3e2':
  Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents
 2014-04-26 00:35:52 +00:00
Jim Miller
44e89d3e2f Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents" 2014-04-26 00:32:32 +00:00
Jim Miller
1d8e0796c5 Add test harness for new keyguard features: 
- disable all notifications on secure keyguard
- disable unredacted notifications on secure keyguard
- disable TrustAgents

Change-Id: I864a103263996dcd491ff77f744bff8398af9cc8
 2014-04-25 15:28:28 -07:00
Andrew Hsieh
b78fd071e5 am 5999e41a: am b7375594: am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64" 
* commit '5999e41aa2e14eab8cc38453454ebfe59129376d':
  Update arch-x86/lib-bootstrap/lib64
 2014-04-25 17:05:53 +00:00
Andrew Hsieh
5999e41aa2 am b7375594: am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64" 
* commit 'b73755948be7081e1e01276f21e9c589a7d24a6d':
  Update arch-x86/lib-bootstrap/lib64
 2014-04-25 17:02:14 +00:00
Andrew Hsieh
b73755948b am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64" 
* commit '36e2bc959feb77b875761710cb8a3a1f43882703':
  Update arch-x86/lib-bootstrap/lib64
 2014-04-25 16:58:59 +00:00
Andrew Hsieh
36e2bc959f am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64" 
* commit '90dada064c8fb05b91889cb7978b7ebe335f7cbb':
  Update arch-x86/lib-bootstrap/lib64
 2014-04-25 16:55:57 +00:00
Andrew Hsieh
b280e72a97 Bump __clang_minor__ check to 6 for __builtin_isnan 
It appears that upstream 3.5 still can't accept __builtin_isnan redeclared
with calling convention, eg.

cat > isnan.c <<EOF
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
EOF

  clang  -target armv5te-none-linux-androideabi -c isnan.c
  isnan.c:1:5: error: function declared 'aapcs' here was previously declared without calling convention
  int __builtin_isnan(double) __attribute__((pcs("aapcs")));
      ^
  isnan.c:1:5: note: previous declaration is here

Change-Id: Iff466fd913c3deec27aa3ff355a208543028d368
 2014-04-25 09:55:31 -07:00
Andrew Hsieh
90dada064c Merge "Update arch-x86/lib-bootstrap/lib64" 2014-04-25 16:51:49 +00:00
Dongwon Kang
3c365838c0 am 0bcf62a1: Merge "Add sample ATSC TvInputService app." 
* commit '0bcf62a1e8cd763f57d4bb26f9cb788b1f29662c':
  Add sample ATSC TvInputService app.
 2014-04-25 16:17:52 +00:00
Dongwon Kang
0bcf62a1e8 Merge "Add sample ATSC TvInputService app." 2014-04-25 10:21:05 +00:00
Andrew Hsieh
fec8b6eb28 Update arch-x86/lib-bootstrap/lib64 
Note that this is only used (symlinked) by android-20/arch-x86/lib-bootstrap
for x86_64 build

Change-Id: I9ab023b0383f406fd5b05debf2dd75ea9f2243d8
 2014-04-24 12:26:29 -07:00
Andrew Hsieh
51fe2ff214 am 693f2b69: am a589c985: am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes." 
* commit '693f2b69049222116840bc9478fadd69baa4c0a8':
  Update libportable to catch up bionic changes.
 2014-04-24 15:48:31 +00:00
Andrew Hsieh
693f2b6904 am a589c985: am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes." 
* commit 'a589c985e9d6cfad4c938004442bc032ef68cee6':
  Update libportable to catch up bionic changes.
 2014-04-24 15:43:20 +00:00
The Android Automerger
58c73db657 merge in master-release history after reset to 2e17ac46c8 2014-04-24 05:49:49 -07:00
Andrew Hsieh
a589c985e9 am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes." 
* commit '36037576fcfe5de9d8862812bd37b5a5cfcd6957':
  Update libportable to catch up bionic changes.
 2014-04-24 09:02:45 +00:00
Andrew Hsieh
36037576fc am 867634ec: Merge "Update libportable to catch up bionic changes." 
* commit '867634ecf44a88e407f6080859b1ca12d159eb63':
  Update libportable to catch up bionic changes.
 2014-04-24 03:07:34 +00:00
Andrew Hsieh
867634ecf4 Merge "Update libportable to catch up bionic changes." 2014-04-24 03:05:22 +00:00
Brett Chabot
347737e393 am 2e17ac46: Merge "Temporarily turn off runtest\'s disabling of dalvik verifier" 
* commit '2e17ac46c8ce8195155475d123d59e85ff912a18':
  Temporarily turn off runtest's disabling of dalvik verifier
 2014-04-23 23:58:57 +00:00