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

5149 Commits

Author SHA1 Message Date
Dan Albert
a76bafdc44 Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 am: a41288b88f 
am: e0bcc4efe9

* commit 'e0bcc4efe96f196104e6de681b28de295d70fb84':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:33:51 +00:00
Dan Albert
e0bcc4efe9 Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 
am: a41288b88f

* commit 'a41288b88f18273a61ed0af977408761598216cf':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:28:19 +00:00
Dan Albert
a41288b88f Merge "Don\'t apply clang flag to gcc builds." 
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:22:57 +00:00
Dan Albert
0eadf57cad Don't apply clang flag to gcc builds. 
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
 2015-11-05 00:59:09 -08:00
Ian Pedowitz
18896e0893 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738 
am: 87455c7397

* commit '87455c7397605fba4bf3ad04af8df3c599a7a6ba':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 23:34:54 +00:00
Ian Pedowitz
87455c7397 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 22:21:48 +00:00
Nicolas Capens
ac465cef41 Assume OpenGL ES 2.0 support for qemu.gles > 0 
Bug 25435727

Change-Id: I1d11c2f03849f1244bdd83e47aa53776acfba6fd
 2015-11-03 17:18:35 -05:00
Ian Pedowitz
95fc53b029 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 22:05:23 +00:00
John Reck
069fb3a03a Revert "Check GLES2 support using EGL instead of qemu.gles" 
This reverts commit 0f897d2fea84c1632377b84f6241d54a8d85f7a3.

Change-Id: Iaf5b22b6b1a5bdb16dd0aaf674d90c09d1bc24a7
 2015-11-03 20:39:51 +00:00
Riley Andrews
8cee7c1711 Limit persistent ashmem backed fds to a minimum of 128kB. 
Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
 2015-11-03 17:46:15 +00:00
Nicolas Capens
0f897d2fea Check GLES2 support using EGL instead of qemu.gles 
Bug 25435727

Change-Id: I9b8816cc8bfc2567ac475888cd57f2b9e62dad4f
 2015-11-03 00:28:59 -05:00
Jeff Sharkey
602940dc6e Merge "Let's sprinkle some FastJNI into Resources." 2015-11-03 03:52:11 +00:00
Jeff Sharkey
46cfd93aa2 Let's sprinkle some FastJNI into Resources. 
Before:

               benchmark   us linear runtime
                GetColor 14.9 ===========
              GetInteger 19.9 ===============
    GetLayoutAndTraverse 38.4 =============================
               GetString 38.5 ==============================

After:

               benchmark   us linear runtime
                GetColor 13.9 ==========
              GetInteger 18.8 ==============
    GetLayoutAndTraverse 38.1 =============================
               GetString 38.2 ==============================

Change-Id: I8c20e14182d2645bc62a0e7fc6345e298b11933c
 2015-11-02 19:49:11 -08:00
Jeff Sharkey
2f40cdc5dc Merge "Let's sprinkle some FastJNI into Parcel." 2015-11-03 02:01:33 +00:00
Jeff Sharkey
0a7a913683 Let's sprinkle some FastJNI into Parcel. 
Before:

    benchmark   ns linear runtime
     ReadByte  918 ===========================
      ReadInt  877 ==========================
     ReadLong  880 ==========================
    WriteByte 1002 ==============================
     WriteInt  945 ============================
    WriteLong  957 ============================
    vm: app_process

After:

    benchmark  ns linear runtime
     ReadByte 824 ===========================
      ReadInt 780 =========================
     ReadLong 780 =========================
    WriteByte 895 =============================
     WriteInt 907 ==============================
    WriteLong 851 ============================
    vm: app_process

Change-Id: I746fe8ea3607e29d86007bd144339c84b063c360
 2015-11-02 17:34:30 -08:00
Rob Carr
64e516f5fa Sync SurfaceView position changes to parent render. 
In order to provide pixel perfect movement of SurfaceViews
'within' other views (e.g. scrolling) we need to be able to
synchronize the attached (parent window) painting with the
movement of the SurfaceView (recall, SurfaceViews are positioned
behind their attached windows and the parent must render a
transparent region for the SurfaceView to appear). Provide
a new WindowManager method to reposition an attaching window
(that is to say, a window which has an attached window like
SurfaceView) and defer the transaction until the parent frame.
SurfaceView is hooked up to use this for movement. This is still
'racy' in the hardware accelerated case as the render thread
could be on either side of dequeing the frame we are working on.

Bug: 22802885
Change-Id: I025d2bdcbe15c1c11047cc0dbca2cf2b7d67c632
 2015-10-30 21:23:28 +00:00
Leon Scroggins III
f35b989d26 Merge six commits from master-skia to master 
Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.

Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
 2015-10-29 12:29:03 -04:00
Tom Hudson
d8f904f256 Revert "Merge six commits from master-skia to master" 
This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
 2015-10-28 20:35:36 +00:00
Leon Scroggins III
550780745f Merge six commits from master-skia to master 
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
 2015-10-28 13:41:38 -04:00
Derek Sollenberger
eba81d0f88 Add missing include for SkPath 
Change-Id: Ib1577714d0e5c7e7c7d0e6593debe30e78f0df59
 2015-10-26 14:23:58 +00:00
Adrian Roos
f8ae610e8c Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b am: 5e5f718d23 
am: 989b719e64

* commit '989b719e649266f41353ff5266cabd5b42a297a5':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:37:05 +00:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b 
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:25:02 +00:00
Adrian Roos
a53bbb652b Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev 
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 17:29:13 +00:00
Roozbeh Pournader
e1e654d09e Merge "Pass the whole locale list down to Minikin." 2015-10-23 01:39:28 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel"" 
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
 2015-10-22 17:49:38 -07:00
Ian Pedowitz
ab49c51342 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 am: 07129d53b5 
am: d3511518f9

* commit 'd3511518f927eead41fb33c56803104672dcffc2':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:53:24 +00:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:46:06 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:37 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel" 
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
 2015-10-22 22:09:04 +00:00
Roozbeh Pournader
f036ead2a2 Pass the whole locale list down to Minikin. 
Also, compute LocaleList's string representation at construction.
This is to further push the cost of doing costly operations related
to LocaleLists to construction time.

Change-Id: Ia55b8ce66b1088ff54cb42eb1e11149b5bd10f17
 2015-10-22 13:14:13 -07:00
Adrian Roos
b531762c89 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
 2015-10-22 01:02:27 +00:00
Adrian Roos
655c12edb0 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel
 2015-10-22 00:49:52 +00:00
Adrian Roos
ab3f972403 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)
 2015-10-22 00:31:47 +00:00
Adrian Roos
bc14a194e0 Merge "Track ashmem memory usage in Parcel" 2015-10-22 00:31:17 +00:00
Adrian Roos
4701a496a5 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
 2015-10-21 16:52:15 -07:00
Mathieu Chartier
1d67f3d3f1 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b am: efa447e1ab 
am: a6358d93a0

* commit 'a6358d93a0f1cbc6469c226f7a77858e00b7de77':
  Fix read_mapinfo to recognize free list large object space
 2015-10-20 01:15:28 +00:00
Mathieu Chartier
7acf8c21d8 Merge "Fix read_mapinfo to recognize free list large object space" 
am: 59d548e1e5

* commit '59d548e1e54fa753d3776647b98dc34ea7c27685':
  Fix read_mapinfo to recognize free list large object space
 2015-10-20 00:30:52 +00:00
Mathieu Chartier
a6358d93a0 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b 
am: efa447e1ab

* commit 'efa447e1ab5a51c96219fc1d6204c128dbbaf661':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:51:35 +00:00
Mathieu Chartier
df0cc41a7b Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:17:09 +00:00
Mathieu Chartier
2e2069d053 Fix read_mapinfo to recognize free list large object space 
Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
 2015-10-19 15:44:26 -07:00
Mathieu Chartier
6421da8f46 Fix read_mapinfo to recognize free list large object space 
Bug: 25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
 2015-10-19 15:22:06 -07:00
Pablo Ceballos
63afb86381 Merge "Remove GLTrace support" 2015-10-19 17:55:59 +00:00
Seigo Nonaka
04cb787762 Merge "Remove MinikinSkiaFont::GetGlyph." 2015-10-19 04:07:44 +00:00
Ruben Brunk
78591f03b7 am 462b8b39: am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '462b8b3986fd194e08c78d66b6cc547af7388830':
  Fix lens shading map origin calculation.
 2015-10-17 07:19:43 +00:00
Ruben Brunk
462b8b3986 am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
  Fix lens shading map origin calculation.
 2015-10-17 07:13:24 +00:00
Ruben Brunk
7a027807a7 am c03443b2: Fix lens shading map origin calculation. 
* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.
 2015-10-17 07:01:19 +00:00
Ruben Brunk
c03443b23d Fix lens shading map origin calculation. 
Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
 2015-10-17 06:55:15 +00:00
Chris Craik
cb45c10b81 Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 18:41:04 +00:00
Chris Craik
0fc1065af7 Use FastJNI for trivial MotionEvent native methods 
Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
 2015-10-16 11:39:50 -07:00
Chris Craik
78327393ac Merge "Rename DisplayListData to DisplayList" 2015-10-16 18:36:01 +00:00