Marco Nelissen
dce97407dc
Update calls to IInterface::asBinder()
...
to use the new static version.
Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
2014-11-14 14:02:09 -08:00
Rob Tsuk
08ad1b05d2
Merge "Fix warnings in hwiu test app"
2014-11-13 17:38:24 +00:00
Rob Tsuk
95e5a82e1d
Merge "Add a way to override Xfermode"
2014-11-13 17:17:06 +00:00
Rob Tsuk
cc3cfdbe8a
Fix warnings in hwiu test app
...
So it's easier to see warnings about actual
problems with new changes.
Change-Id: I992711bf12bb25fbfd87fcab15993d5c5f66f46c
2014-11-12 16:24:59 -08:00
ztenghui
952de42b45
am 5679d937: am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev
...
* commit '5679d937ff033ff1fa86245d646b6e5dbf23d635':
Shadow: Fix the crash in spot shadow
2014-11-12 23:59:49 +00:00
Rob Tsuk
c495e611b9
Add a way to override Xfermode
...
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.
Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
2014-11-12 15:49:45 -08: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
Dan Albert
45670c1dc5
am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
...
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
Move frameworks/base over to libc++.
2014-11-12 21:31:33 +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
Dan Stoza
a41f29cc00
Change GraphicBuffer fields from uint to int
...
This changes fields which are tracking GraphicBuffer width and height
to use int instead of uint32_t, which is in keeping with a recent
change to GraphicBuffer itself and avoids a warning (error since this
build uses -Werror).
Change-Id: I66c5c3e3d321d4ef5ea2c40c86ac068111c18662
2014-11-12 12:35:42 -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
586c36780e
am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time"
...
automerge: 7be350d
* commit '7be350d2cf4415ee08f628ffe1b06f5f17a71411':
Frameworks/base: Wall Werror in common_time
2014-11-12 17:44:49 +00: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
4fc2fd3ce5
Merge "resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp"
2014-11-12 17:34:38 +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
edaecc1db0
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
...
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
2014-11-10 21:29:52 -08:00
Andreas Gampe
9bd7896ef8
am 6ca82929: am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input"
...
* commit '6ca82929b1253f95f08612f737baeee35a3849bd':
Frameworks/base: Wall Werror in libs/input
2014-11-11 05:26:31 +00: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
32291900ec
am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit '984d81c3937d46240fb9645ffa37c5166284a983':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:18:10 +00: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
c6dcf1fd67
am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings"
...
* commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162':
Frameworks/base: Fix more warnings
2014-11-09 00:52:52 +00: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
47119ad669
am 1897a8e2: am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage"
...
* commit '1897a8e2fbf94169061e568683fbeda0c3bae0b6':
Frameworks/base: Wall Werror in libs/storage
2014-11-08 02:15:46 +00: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
1c0668a3f8
am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
...
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
Frameworks/base: Wall Werror in libs/androidfw
2014-11-07 23:17:40 +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
e19093cad8
am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
...
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
Have an actual fallback if the surface is lost
2014-11-07 23:01:00 +00: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
130a3a081f
Fix DisplayListRenderer breakage
...
Change-Id: I30babebd2b50efe6830be466209341057601544f
2014-11-07 12:42:10 -08:00
John Reck
65f2defdfc
resolve merge conflicts of cabf8a7 to master.
...
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
2014-11-07 11:29:08 -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