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

6155 Commits

Author SHA1 Message Date
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Chris Craik
70850ea258 Improve logging around performance critical events 
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
 2014-11-19 17:24:30 -08:00
John Reck
842697a360 am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev 
* commit 'decc26df39b734ca1cbaccda1cbe3b355eba6898':
  Trace some interesting events
 2014-11-18 21:33:19 +00:00
John Reck
f0f68117c4 Merge "Trace some interesting events" into lmp-mr1-dev 2014-11-18 21:23:50 +00:00
Chih-hung Hsieh
cb82b7f182 am a58336f6: Merge "Use fabsf() rather than abs()" 
* commit 'a58336f6c8aa44373485e5a6d7ec32677387a935':
  Use fabsf() rather than abs()
 2014-11-17 22:59:11 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs() 
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 23:12:18 +01:00
Adam Lesinski
11bdd5b10b Merge commit '06d8b7b8' into manualmerge 
Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
 2014-11-17 12:17:16 -08:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
John Reck
fbc8df03e4 Trace some interesting events 
Bug: 18337099
Change-Id: Ie2e60da2b9f06e0368061c944d8123ab6903355c
 2014-11-17 10:18:31 -08:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
ztenghui
5679d937ff am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit 'ab6515f6214a09e23deee4b432b41d1849ae403f':
  Shadow: Fix the crash in spot shadow
 2014-11-12 23:49:08 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
ztenghui
4e50ee4f42 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 2014-11-12 21:16:31 +00:00
Dan Albert
5e6cf24213 Merge "Move frameworks/base over to libc++." 2014-11-12 21:11:49 +00:00
ztenghui
3932063bc7 Shadow: Fix the crash in spot shadow 
Fix the crash from searching for closest umbra vertex by initialized the
starting index correctly.

Fix another potential crash related to ray intersection by introducing epsilon.

b/18315089

Change-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33
 2014-11-12 12:58:08 -08:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
 2014-11-12 12:25:24 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Andreas Gampe
7be350d2cf am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time" 
* commit 'b93f8d02f886d078b268fe5fd61a95f6911c2644':
  Frameworks/base: Wall Werror in common_time
 2014-11-12 17:42:50 +00:00
Andreas Gampe
b93f8d02f8 Merge "Frameworks/base: Wall Werror in common_time" 2014-11-12 17:35:15 +00:00
Andreas Gampe
4c57eda9f4 Frameworks/base: Wall Werror in common_time 
Turn on warnings and errors in common_time.

Fix a code path in CommonTimeServer::handleSyncResponse in which
and uninitialized variable is returned.

Change-Id: I2f80f063c625f032266647d0507f573370202707
 2014-11-12 08:04:43 -08:00
Andreas Gampe
6ca82929b1 am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input" 
* commit 'c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b':
  Frameworks/base: Wall Werror in libs/input
 2014-11-11 04:56:54 +00:00
Andreas Gampe
1272887050 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
 2014-11-10 20:54:07 -08:00
Andreas Gampe
c6e992a1bc Merge "Frameworks/base: Wall Werror in libs/input" 2014-11-11 02:38:08 +00:00
Andreas Gampe
1d03b816fe Merge "Frameworks/base: Wall Werror in libs/hwui" 2014-11-11 02:37:46 +00:00
Andreas Gampe
1e19674107 Frameworks/base: Wall Werror in libs/hwui 
Turn on -Wall -Werror in libs/hwui. Fix errors.

Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
 2014-11-10 15:58:04 -08:00
Andreas Gampe
6b83b76dd1 Frameworks/base: Wall Werror in libs/input 
Enable -Wall -Werror in libs/input. Mask warnings from Skia.

Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
 2014-11-10 15:55:11 -08:00
Elliott Hughes
984d81c393 am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:10:21 +00:00
Elliott Hughes
4da9dc5a62 bionic's struct stat is now POSIX-compliant. 
One less hack needed...

Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
 2014-11-10 10:48:25 -08:00
Andreas Gampe
5bbb52e8a4 am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
  Frameworks/base: Fix more warnings
 2014-11-09 00:48:11 +00:00
Andreas Gampe
189bf05616 Merge "Frameworks/base: Fix more warnings" 2014-11-09 00:37:42 +00:00
Andreas Gampe
25df5fba3a Frameworks/base: Fix more warnings 
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.

Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
 2014-11-07 22:24:57 -08:00
Andreas Gampe
1897a8e2fb am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" 
* commit '9ade8c1ad59a40f1a2fdbe88074d05aa97a95aff':
  Frameworks/base: Wall Werror in libs/storage
 2014-11-08 02:11:03 +00:00
Andreas Gampe
9ade8c1ad5 Merge "Frameworks/base: Wall Werror in libs/storage" 2014-11-08 01:14:59 +00:00
Andreas Gampe
83892ecb5c Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-07 23:15:30 +00:00
Andreas Gampe
dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp 
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
 2014-11-07 15:14:02 -08:00
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
 2014-11-07 22:55:32 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
Andreas Gampe
2204f0bf56 Frameworks/base: Wall Werror in libs/androidfw 
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.

Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
 2014-11-07 13:35:05 -08:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
John Reck
cabf8a7064 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
  Fix wrong-thread issue
 2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Mårten Kongstad
cb7b63d928 RRO: prevent duplicate system overlays 
System overlays, ie overlays with targetPackage="android", were loaded
twice, which caused all sorts of issues. Ensure they are only loaded
once, which will be during Zygote initialization.

Bug: 17765434
Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
 2014-11-07 16:08:22 +01:00
Mårten Kongstad
96198ebae8 RRO idmap: pad with 0xffffffff, not 0x00000000 
In the new idmap format (version 0x1), 0x00000000 no longer represents a
non-existing entry: 0xffffffff should be used instead.

Bug: 17765434
Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7
 2014-11-07 16:08:04 +01:00
Mårten Kongstad
30113131fb RRO: reintroduce lost ResTable insert of assets 
With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
 2014-11-07 16:07:42 +01:00
ztenghui
86f289fb50 am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '0b70c09c1df3a5c359b8a93a8ac08e945805b693':
  A better looking and faster spot shadow.
 2014-11-07 00:17:09 +00:00