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

6151 Commits

Author SHA1 Message Date
Rob Tsuk
fce461eada am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'db6a1358d45430a952aa746f8dfd452d12d7e4be':
  Log shader source when it fails to compile
 2014-11-05 22:31:05 +00:00
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Rob Tsuk
fd15f47554 Log shader source when it fails to compile 
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
 2014-11-05 13:26:19 -08:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
Adam Lesinski
a7d1d73a47 Implement back-tracking when searching for attributes in XML or resource bag 
Shared libraries have their package ID assigned at run-time, so some
of the guarantees we used to have about sort order of attributes in
bags or XML elements no longer hold.

This CL adds back-tracking and can jump to the nearest attribute with the
same package ID and continue searching.

This means that attributes with the same package ID must be sorted by increasing
resource ID, as was the case before.

Attributes with the same package ID must be grouped together, but the groups can
be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032

Bug:17666947
Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
 2014-11-04 16:34:34 -08:00
Rob Tsuk
6bd8d825b2 am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'c4aea977cd35c423132382cf0ae1f3238e2c7d10':
  Make points drawn with default paint visible
 2014-11-04 15:29:10 +00:00
Rob Tsuk
e6c0bda5dd Merge "Make points drawn with default paint visible" into lmp-mr1-dev 2014-11-04 15:20:00 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Rob Tsuk
b7c26562d0 Make points drawn with default paint visible 
When no stroke width is set, use 0.5 instead of 0.25 to make
sure the resulting rectangle spans at least one pixel.

Bug: 15455111
Change-Id: Id0a4b6d014c542ffc98b13a032f88ae0ce69b3a1
 2014-11-04 00:31:45 +00:00
Adam Lesinski
de7de47fef Add error checking to aapt for split generation 
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
 2014-11-03 15:55:44 -08:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Adam Lesinski
4bf58108d4 Fix issues that will be present in C++11 
- char16_t is a distinct type, so stay consistent
  with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
  Since we mmap and cast data structures onto raw memory,
  we need a precise definition (uint16_t), so we cast between
  that (and static_assert that they are the same size).

Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
 2014-11-03 11:49:47 -08:00
John Reck
8a8a40556e am 541641d0: Merge "Fix counting" into lmp-mr1-dev 
automerge: 5c8d135

* commit '5c8d135920896af42de8d8b91975abe3fa871cd9':
  Fix counting
 2014-11-03 18:42:30 +00:00
John Reck
88f5fc7c5a Fix counting 
Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
 2014-11-03 10:32:24 -08:00
John Reck
e05575e9c3 am a8d83d63: Merge "Layer changes" into lmp-mr1-dev 
automerge: a51fba0

* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
  Layer changes
 2014-10-31 23:25:44 +00:00
John Reck
a8d83d639a Merge "Layer changes" into lmp-mr1-dev 2014-10-31 22:55:47 +00:00
John Reck
0e89e2b7bc Layer changes 
Bug: 17208461

* Switch Layer to be VirtualLightRefBase instead of
  Caches' side-channel ref-counting
* Include active layers in gfxinfo dump
* Run gfxinfo dump on the correct thread
* Dump gfxinfo on Layer creation failure

Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
 2014-10-31 15:30:10 -07:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
John Reck
97054254d4 am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
 2014-10-30 19:16:14 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
Narayan Kamath
3cad510e27 am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.
 2014-10-29 19:34:32 +00:00
John Reck
141823ec63 Merge "Be more conservative about current buffer" into lmp-mr1-dev 2014-10-29 14:40:02 +00:00
Narayan Kamath
4ed472ab33 resolved conflicts for merge of 3028394c to stage-aosp-master 
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
 2014-10-29 12:12:37 +00:00
Adam Lesinski
d75d3eb5e4 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
automerge: 06caf1b

* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 18:09:20 +00:00
Adam Lesinski
31b76b66b1 Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 2014-10-28 17:41:12 +00:00
John Reck
c7c8b06940 Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad 
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
  Cleanup debug options
 2014-10-28 00:35:14 +00:00
John Reck
950ff1b88c Be more conservative about current buffer 
Bug: 18065565
Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
 2014-10-27 13:23:20 -07:00
John Reck
23d307c8d8 Cleanup debug options 
Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
 2014-10-27 12:43:25 -07:00
Chih-Hung Hsieh
d3448e437a Suppress Clang compilation warnings. 
Ignore warnings about unused parameters and initialization of static
constant float data members.

Change one potential error of allocating variable length
array of non-POD element type on stack.

Fix mismatch of class and struct declaration tags.

BUG: 17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
 2014-10-24 15:42:14 -07:00
Adam Lesinski
f001e37b31 libandroidfw: Do not build device library when building SDK 
Building the windows SDK causes a build failure if the device
libandroidfw target is not omitted.

Change-Id: I587b166342d0d047820911d279f192d2b39b6263
 2014-10-24 18:39:56 +00:00
Adam Lesinski
705f2ac424 am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev 
automerge: 93b43445

* commit '93b434451abd11ff58ada66abdcddb3f33bb5023':
  Added some more Split density tests
 2014-10-24 02:01:16 +00:00
Adam Lesinski
879f237acb Merge "Added some more Split density tests" into lmp-mr1-dev 2014-10-23 23:03:48 +00:00
Adam Lesinski
6029319737 Added some more Split density tests 
Change-Id: I3b83515f1240e713bbcff5385cf054bba693f297
 2014-10-23 16:01:58 -07:00
John Reck
b64e4372bb am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:15:46 +00:00
John Reck
badac04dfd Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 2014-10-23 21:59:26 +00:00
John Reck
1125d1fa92 Add some free zoom to lockHardwareCanvas 
Bug: 18099195

Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will
never benefit. Also clean up some confusing naming

Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
 2014-10-23 13:59:47 -07:00
John Reck
41707d01e9 am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
  Fix damage bug
 2014-10-23 20:41:07 +00:00
John Reck
5c9d717d3e Fix damage bug 
Bug: 18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
 2014-10-22 11:32:27 -07:00
Bill Yi
5a71f83227 Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
 2014-10-22 09:00:49 -07:00
Andreas Gampe
2b3a8cd808 Frameworks/base: Wall Werror in libs/storage 
Turn on -Wall -Werror in libs/storage.

Change-Id: I314cb32d0a917f9261488f7709d9a78a07b10fea
 2014-10-22 08:15:54 -07:00
John Reck
a2590d595f am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev 
automerge: a91c5ca

* commit 'a91c5ca78a0e9b24445126895a0070d399506849':
  Fix memory corruption in test
 2014-10-22 14:29:45 +00:00
John Reck
733bb3bc78 Merge "Fix memory corruption in test" into lmp-mr1-dev 2014-10-22 14:18:21 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Dan Albert
827d00f2f4 am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '3d23d557ff00010c041ec3fc655472db3d12509e':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:11:52 +00:00
Dan Albert
00b4e773ab More LOCAL_ADDITIONAL_DEPENDENCIES. 
Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
 2014-10-21 08:58:39 -07:00
John Reck
af608319f2 Fix memory corruption in test 
Bug: 18012918
Change-Id: I8d69624e9be9f0399ddba10ce3903f93177d5930
 2014-10-16 09:18:11 -07:00
John Reck
1467c54d85 am f3259620: am 94c40fe9: CARD LAND! 
* commit 'f325962096663a5264f2ec613293818f7f3ea2f9':
  CARD LAND!
 2014-10-14 17:51:07 +00:00
John Reck
94c40fe921 CARD LAND! 
Bug: 16712006

Initial work towards benchmarking HWUI systems
Currently this will just create a screen full of
"cards" to simulate a high load scenario for
shadows and clipping

Change-Id: Ie9f9a9570844e136db8053e8fc62fe06cb922a5f
 2014-10-14 09:02:04 -07:00