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

6903 Commits

Author SHA1 Message Date
Chris Craik
749e67438c Revert "Support High Contrast Text for all canvas types" 
bug:22820834

This reverts commit 876d56612ab8ec7032f702905d694670e6c4febd.

Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
 2015-07-29 18:14:46 +00:00
John Reck
c36df95229 Re-enable -Werror on clang 
Change-Id: I582bd0665752c7a9deb4f9de094d0dd0a50cda6a
 2015-07-29 10:09:36 -07:00
Derek Sollenberger
2d35cf953a Merge "Support High Contrast Text for all canvas types" 2015-07-29 14:36:09 +00:00
Adam Lesinski
de4c02645e am 3ab63f63: am 68d982da: am f02a02c2: am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev 
* commit '3ab63f637f4ff4a6783bdd197734d67d605c453d':
  AAPT: Fix printing of resource configurations
 2015-07-28 18:46:41 +00:00
Chris Craik
504070587b Merge "Fix comment about swap buffers with damage" 2015-07-28 18:06:19 +00:00
Chris Craik
7cd262a59c Fix comment about swap buffers with damage 
Change-Id: I7957bed4488453019ad9f09427d81741bca4e5e9
 2015-07-28 10:46:52 -07:00
Andreas Gampe
cb4af9b10a Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-07-27 18:22:08 -07:00
Adam Lesinski
3ab63f637f am 68d982da: am f02a02c2: am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev 
* commit '68d982dab9ebba2accb7aa37f55cf68548d24818':
  AAPT: Fix printing of resource configurations
 2015-07-28 00:57:35 +00:00
Adam Lesinski
33d4bd4a9b am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev 
* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
  AAPT: Fix printing of resource configurations
 2015-07-28 00:35:46 +00:00
Adam Lesinski
e1e94c7d58 am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev 
* commit 'fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
  AAPT: Fix printing of resource configurations
 2015-07-28 00:16:38 +00:00
Adam Lesinski
5b0f1be0a2 AAPT: Fix printing of resource configurations 
Print out proper, copied configuration. We add fields to ResTable_config
and if we don't copy and fill in defaults when reading old configurations,
we end up with garbage values. This can potentially cause a crash as well.

Bug:22773426
Change-Id: I64f5ebe73ee72453bcdad3a19e48f8e7ad58e9c2
 2015-07-27 17:04:43 -07:00
Leon Scroggins III
0e9059b454 Change from SkDeviceProperties to SkSurfaceProps. 
Fixes build.

Change-Id: Id6b0f96830761f8b6896169327de90f3b390e3c9
(cherry picked from commit 8ebf97a668e7a53bb9810aa5049a8b28435143d2)
 2015-07-24 15:55:48 +00:00
John Reck
83b8832397 am 23861bb9: am 78d491ac: am 452b62e1: am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev 
* commit '23861bb9d0f4bfeb11ba0989418d567207eb06f3':
  Move updateMatrix() call to animateCommon
 2015-07-24 05:16:21 +00:00
John Reck
9e5f4af1ed am 11f9da31: am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup 
* commit '11f9da310ac3129cd859ef98f7f10d897308a59b':
  Fix a race condition that could cause lockup
 2015-07-24 05:14:44 +00:00
John Reck
23861bb9d0 am 78d491ac: am 452b62e1: am c5d3dde6: am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev 
* commit '78d491ac8dbf85424e87386bedeee0016df6f7fb':
  Move updateMatrix() call to animateCommon
 2015-07-24 04:06:47 +00:00
John Reck
11f9da310a am bdb2a905: am d08fb687: am e5783e58: am 2abf0f24: Fix a race condition that could cause lockup 
* commit 'bdb2a90570b6fcdcb85d010070f77f7cea61e41a':
  Fix a race condition that could cause lockup
 2015-07-24 04:05:13 +00:00
John Reck
c5d3dde6c7 am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev 
* commit '8b1154c487c25388107dc024376435f3b0ae2385':
  Move updateMatrix() call to animateCommon
 2015-07-24 00:02:23 +00:00
John Reck
1f4b21b94c am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev 
* commit '8b1154c487c25388107dc024376435f3b0ae2385':
  Move updateMatrix() call to animateCommon
 2015-07-24 00:02:08 +00:00
John Reck
49dec430e8 Move updateMatrix() call to animateCommon 
Bug: 22667315

HWUI internally always assumes that RenderNode->properties()
has a fully-baked matrix. However, RenderThread animations violate
this and will perform an update of that matrix after they run. This
was missing in the fallback scenario where an animation was
running on a View that is detached from the tree.

If a RenderThread animation is started on an attached view, it becomes
detached, and is then re-attached it will crash in the staging
properties push. The fix for this is to move the call to updateMatrix
from animate() to animateCommon() so that the animateNoDamage()
path will similarly perform the necessary matrix update.

Change-Id: I4c899a6f68659342a6515f1d7f20d3c4af65caf0
 2015-07-23 22:37:21 +00:00
John Reck
e5783e58db am 2abf0f24: Fix a race condition that could cause lockup 
* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup
 2015-07-23 19:20:47 +00:00
John Reck
b9ce737499 am 2abf0f24: Fix a race condition that could cause lockup 
* commit '2abf0f24af60b8644d5b61eed9666793083546ee':
  Fix a race condition that could cause lockup
 2015-07-23 19:00:24 +00:00
John Reck
2abf0f24af Fix a race condition that could cause lockup 
Bug: 22676664

If a task is queued on a worker thread that is busy
processing a task AND a trim memory signal comes along
prior to the initial task being completed then the
tasks that were queued prior to the exit request will
never be processed.

This is bad, as when those futures are used later on, such
as in trying to delete them from the cache, they will block
waiting for the orphaned task to be finished.

Simple fix is to just never stop the worker threads. Increase
RAM usage slightly as we won't reclaim that stack space, but
this cost is fairly small

Change-Id: I818b011f9bc6ba06942fdad81c27656bd97b42d4
 2015-07-23 17:34:14 +00:00
Yusuke Sato
c796ad0a8b Clean up AssetManager::scanAndMergeZipLocked 
Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

Change-Id: Ia93c3ab3fa688ce013dd9febbf0f4bd3ee1f3e5e
 2015-07-22 15:29:43 -07:00
John Reck
c052a9a1bb am a2fd3234: am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit 'a2fd32348b06b22963fcc7c33179fddbd2394dbf':
  Mark isInUse per-window
 2015-07-21 22:00:50 +00:00
John Reck
a2fd32348b am 3bfe4b47: am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '3bfe4b47c7629fab50e64a62d1fa72ab714aa9e0':
  Mark isInUse per-window
 2015-07-21 21:45:54 +00:00
John Reck
9317d0b990 am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:04:45 +00:00
John Reck
0ccb23e4be am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:01:45 +00:00
John Reck
00e79c9947 Mark isInUse per-window 
Bug: 22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
 2015-07-21 10:46:54 -07:00
Chris Craik
011550e1f2 am 3699c603: am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '3699c60323aca45eb0e385d6b4a27bd5861fadf2':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 01:05:25 +00:00
Chris Craik
3699c60323 am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '62a2696cd2b7387ce20ec9cb9805563f313da86a':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:51:34 +00:00
Chris Craik
ce7ef7520f am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:08:47 +00:00
Chris Craik
b6e41a0882 am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:07:13 +00:00
Chris Craik
0bb5c26bce Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 2015-07-17 23:59:17 +00:00
Chris Craik
6ad690e16f Fix AssetAtlas usage in BitmapShaders 
bug:22521999

Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
 2015-07-17 15:53:24 -07:00
Chris Craik
86c96504be am 8f587bfb: am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '8f587bfb05c0db2d48692c9701ac2d97e43acdc1':
  Fix clip area behavior for REPLACE op
 2015-07-16 23:20:39 +00:00
Chris Craik
8f587bfb05 am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '4c93506881fa710d69557a592f3fc7759b3ec9c4':
  Fix clip area behavior for REPLACE op
 2015-07-16 23:05:36 +00:00
Chris Craik
cb778a8e58 am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op
 2015-07-16 22:25:10 +00:00
Chris Craik
7b0fa466b5 am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op
 2015-07-16 22:23:34 +00:00
Chris Craik
8ce8f3f4d6 Fix clip area behavior for REPLACE op 
bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a
 2015-07-16 13:31:41 -07:00
Chris Craik
1d5d34624b Merge "Clean up unncessary defines" 2015-07-16 20:11:05 +00:00
John Reck
7f9c7b7694 am be7e2a47: am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'be7e2a476fd8f3e25710a96a391a2d9ca2ddad99':
  Don't crash on makeCurrent fail
 2015-07-16 19:20:46 +00:00
John Reck
be7e2a476f am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit '599287b14d32bbe6b5eea4e610cc14d8224362b6':
  Don't crash on makeCurrent fail
 2015-07-16 17:43:53 +00:00
John Reck
d5612d06c4 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
 2015-07-16 17:01:22 +00:00
John Reck
7e560444e7 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
 2015-07-16 17:01:17 +00:00
John Reck
f2dcc2aecb Don't crash on makeCurrent fail 
Bug: 22444755

WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this

Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
 2015-07-16 09:17:59 -07:00
Chris Craik
5a4690bf26 Clean up unncessary defines 
LOG_TAG and TRACE_TAG are already defined in the makefile

Change-Id: I9e53e3dacbe018441edd74cb7c8c90846defee74
 2015-07-14 13:25:38 -07:00
Chris Craik
401415d35e am cd843caa: am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit 'cd843caa3704a14d02a2b8df6e72be8a2f53049c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 18:47:39 +00:00
Chris Craik
cd843caa37 am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '230d8243de5ef33a18c610a7b2f21fb6caa8e277':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 18:21:45 +00:00
Chris Craik
e2a5c184e3 am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:35:50 +00:00
Chris Craik
65d8b59b0f am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:13:23 +00:00