drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,817 Commits 1 Branch 0 Tags
Commit Graph

252817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Mok
b4e6b8a3df Merge "Fix random crash in libhwui" am: 3f67a1855e 
am: 9aaf189103

Change-Id: I87d1c7b03bbf231fa059df53b667687ec68589ef
 2016-08-05 18:41:07 +00:00
Keith Mok
9aaf189103 Merge "Fix random crash in libhwui" 
am: 3f67a1855e

Change-Id: I8dfcad3d00b2cca955457142b963934143ec2cbd
 2016-08-05 18:37:14 +00:00
Treehugger Robot
3f67a1855e Merge "Fix random crash in libhwui" 2016-08-05 18:23:14 +00:00
Tobias Thierer
22aa35d510 Merge "APIs for ProcessBuilder.Redirect" am: e49469aed1 
am: c548ff23bd

Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
 2016-08-05 12:51:50 +00:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect" 
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
 2016-08-05 12:44:48 +00:00
Tobias Thierer
95b759e178 Update api/test-current.txt for ProcessBuilder API 
am: 6af44aeea0

Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
 2016-08-05 12:44:35 +00:00
Tobias Thierer
6af44aeea0 Update api/test-current.txt for ProcessBuilder API 
Test: make update-api docs

Bug: 27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
 2016-08-05 12:37:21 +00:00
Tobias Thierer
e49469aed1 Merge "APIs for ProcessBuilder.Redirect" 2016-08-05 12:36:35 +00:00
Przemyslaw Szczepaniak
96194e10a6 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master 
am: e2e65a4708

Change-Id: If3fe3c4e5d242dc768789b093ddef2bbc08f4c78
 2016-08-05 10:32:44 +00:00
Przemyslaw Szczepaniak
7116e5d2d3 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
am: 49929ccf46

Change-Id: Ie9d2d41124395588fa58dc0f97447a9e77094609
 2016-08-05 10:32:39 +00:00
Przemyslaw Szczepaniak
e2e65a4708 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master 2016-08-05 10:25:24 +00:00
Przemyslaw Szczepaniak
c57b96bf11 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 
am: 622e170338

Change-Id: Ia1fde043f68030d5676c39f9eda632061ef09eab
 2016-08-05 09:51:59 +00:00
Przemyslaw Szczepaniak
622e170338 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 
am: 50f3429d14

Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
 2016-08-05 09:44:55 +00:00
Przemyslaw Szczepaniak
50f3429d14 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 2016-08-05 09:36:41 +00:00
Przemyslaw Szczepaniak
49929ccf46 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
Version with test-current.txt

Bug: 28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
 2016-08-05 09:33:51 +00:00
Hans Boehm
47a6b76511 resolve merge conflicts of c73e080 to nyc-dev-plus-aosp 
Change-Id: I9629e28bff28a67a6584c5e67a01ef25428a2194
 2016-08-04 20:04:08 -07:00
Hans Boehm
c73e080eea Merge "Update SMP documentation." 
am: 497ac5eccb

Change-Id: I06d06e205a8bf7646500fa6c8d86eb7cfa49e6ce
 2016-08-05 02:05:57 +00:00
Hans Boehm
497ac5eccb Merge "Update SMP documentation." 2016-08-05 01:59:38 +00:00
Andre Eisenbach
4184bab40b Merge "Fix bad index usage" am: 5cfe8a8315 
am: 83272db445

Change-Id: Ie20fd9eea99d4ec730e40045a693181da70ec786
 2016-08-04 21:29:34 +00:00
Hans Boehm
9e629adc4a Update SMP documentation. 
The old version was seriously obsolete, primarily in that it ignored
C11 and C++11 atomics and the programming model underlying them.  As
a result it paid way too much attention to hardware characteristics,
which 0.001% of application programmers should really be aware of.
And some of those hardware descriptions were also obsolete.

This is a fairly complete rewrite.

Bug: 18523857

Change-Id: Icc14a390f74486193486c2ba07a86b05611e7d3c
 2016-08-04 14:21:48 -07:00
Jakub Pawlowski
83272db445 Merge "Fix bad index usage" 
am: 5cfe8a8315

Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f
 2016-08-04 20:46:32 +00:00
Andre Eisenbach
5cfe8a8315 Merge "Fix bad index usage" 2016-08-04 20:20:02 +00:00
Jakub Pawlowski
d167db19a9 Fix bad index usage 
Bug: 27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e
 2016-08-04 20:19:52 +00:00
Hemal Patel
790aa26f8c Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11 
am: ab35b73d1b

Change-Id: I006d4a5df9d850c3367d2a441fe86c320fee6c56
 2016-08-04 19:48:26 +00:00
Hemal Patel
43c0f74d0c Docs: Fixed info about spanning multiple columns am: 64e88cd296 
am: 611f50d62f

Change-Id: Ie4daa14c817f2781e06a6a0d1d68a245780580e8
 2016-08-04 19:48:19 +00:00
Hemal Patel
ab35b73d1b Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs 
am: ca7eee3d11

Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d
 2016-08-04 19:43:20 +00:00
Hemal Patel
611f50d62f Docs: Fixed info about spanning multiple columns 
am: 64e88cd296

Change-Id: I8c4219e946fddbfc023bbe77549cc12fc0b6bd3a
 2016-08-04 19:43:18 +00:00
Hemal Patel
ca7eee3d11 Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs 2016-08-04 19:38:42 +00:00
Bert McMeen
a89c2719a3 Docs: Fixed typo in API Overview am: 844c43a904 
am: 653b768997

Change-Id: I55ac0a468ff1f0748ffeaca1b99b0c6992cef676
 2016-08-04 18:28:27 +00:00
Bert McMeen
653b768997 Docs: Fixed typo in API Overview 
am: 844c43a904

Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4
 2016-08-04 18:20:51 +00:00
Bert McMeen
7000a4d1ba Merge "Docs: Fixed typo in API Overview" into nyc-dev 
am: 62faea4f12

Change-Id: I849e6e3fed25bf7977263b1f57473dbaf544eb78
 2016-08-04 18:08:50 +00:00
Bert McMeen
aea8d109c4 Docs: Fixed typo in API Overview 
am: f27ab3c126

Change-Id: I08ed3c58d13fbeb93e331897641977633a6b807e
 2016-08-04 18:08:43 +00:00
Bert McMeen
844c43a904 Docs: Fixed typo in API Overview 
Bug: 30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit f27ab3c12625f34a4221477001a603390b505e65)
 2016-08-04 18:04:30 +00:00
Bert McMeen
62faea4f12 Merge "Docs: Fixed typo in API Overview" into nyc-dev 2016-08-04 18:01:29 +00:00
Chih-hung Hsieh
e4e1670ecf Merge "Enable clang for arm64." am: a11a8e5086 
am: 9650521ed1

Change-Id: Ia9435472a720bc22255924cf4caee13eafda5870
 2016-08-04 17:25:35 +00:00
Chih-Hung Hsieh
9650521ed1 Merge "Enable clang for arm64." 
am: a11a8e5086

Change-Id: If6069ad099ec5068b9b77f1ea84b85ff4a20438d
 2016-08-04 17:19:10 +00:00
Chih-hung Hsieh
a11a8e5086 Merge "Enable clang for arm64." 2016-08-04 17:13:53 +00:00
Chih-Hung Hsieh
248bed0334 Enable clang for arm64. 
emutls should work now with latest prebuilt clang/llvm.

BUG: 25642296
Test: build and boot up on arm64 emulator.

Change-Id: I5c8dd36a1575436e5fd56e91f7c285f2b3e6546f
(cherry picked from commit 8ffb6b76f7a72e14882e09f882494e5f7d5fc45d)
 2016-08-04 17:09:55 +00:00
Przemyslaw Szczepaniak
c7788d528c Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe 
am: 82957239fe

Change-Id: Ic29f6cd27e4f84dc5afb49360ffd2235ab25aa71
 2016-08-04 12:08:22 +00:00
Przemyslaw Szczepaniak
82957239fe Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe 
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug: 30402085
 2016-08-04 11:56:09 +00:00
Tobias Thierer
c150ad3357 Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119ccd3 
am: 97b24c2f6a

Change-Id: I33dad5406389705ca2daa9baa75c1c7b42df046e
 2016-08-04 11:06:54 +00:00
Tobias Thierer
97b24c2f6a Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 
am: f1d119ccd3

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
 2016-08-04 11:00:03 +00:00
Tobias Thierer
f1d119ccd3 Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 2016-08-04 10:51:14 +00:00
Sreevani Sreejith
ec62c0780f Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 
am: f5a2fbc156

Change-Id: I914433dbb9ab473d9dc14b317478af0a1db92e23
 2016-08-04 02:37:12 +00:00
sreevanis
a56d5f9583 resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc 
am: fdaac48e99

Change-Id: I525b4b81660dfd21e7ef992ee803f94d58c629b9
 2016-08-04 02:37:09 +00:00
sreevanis
f5a2fbc156 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs 
am: 3faf6114b0

Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
 2016-08-04 02:23:43 +00:00
sreevanis
fdaac48e99 resolve merge conflicts of 9d47cae to nyc-docs 
am: d5cabb92bc

Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
 2016-08-04 02:23:39 +00:00
Sreevani Sreejith
3faf6114b0 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs 2016-08-04 02:14:26 +00:00
Andre Eisenbach
b522118d5e Merge "HFP 1.7 profile update (3/4)" am: f28f6bb2b0 
am: a095ee3c1d

Change-Id: I31570d1d9da08e6d7481ffead5ef7625c88018f2
 2016-08-04 01:43:00 +00:00
Mudumba Ananth
a095ee3c1d Merge "HFP 1.7 profile update (3/4)" 
am: f28f6bb2b0

Change-Id: I0211cecf91f324d24b7b5524344812f7d6b6602a
 2016-08-04 01:32:41 +00:00