Tenghui Zhu
76d20b4a5c
Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev
2015-11-05 20:05:37 +00:00
Joe LaPenna
88c7c3e080
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
...
Also remove DEBUG-related timeout changes to have consistent behavior.
BUG: 24247417
BUG: 25463669
BUG: 23753686
Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2
2015-11-05 11:58:48 -08:00
Jeff Sharkey
f131e1aae9
Kick movement preconditions onto handler thread.
...
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app. If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.
Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.
Bug: 25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
2015-11-05 10:28:43 -08:00
Chris Craik
e0fa7476a5
Revert "Remove -ffast-math from libhwui makefile"
...
This reverts commit e02ec7c37a92fd63748a610bac6a23d0409788cf.
Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
2015-11-05 17:58:28 +00:00
Deepanshu Gupta
71093465ab
Merge "Fix Switch colors" into mnc-ub-dev
2015-11-05 17:21:16 +00:00
Deepanshu Gupta
c9b8f95c99
Fix Switch colors
...
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
2015-11-05 09:20:07 -08:00
Teng-Hui Zhu
cf22d184a3
When the incoming light source is invalid, don't generate any shadow
...
b/25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
2015-11-04 17:04:18 -08:00
Riley Andrews
6c1144dc0f
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d
...
am: 2c740f1dcf
* commit '2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
Convert ashmem bitmap thresholds to constants.
2015-11-04 20:30:48 +00:00
Riley Andrews
2c740f1dcf
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
...
am: c8bb39d98d
* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
2015-11-04 20:24:36 +00:00
Riley Andrews
c8bb39d98d
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
2015-11-04 20:18:35 +00:00
Chris Craik
a853bb450c
Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b
...
am: 8b581e2bc7
* commit '8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
Early return when the scale is 0.
2015-11-04 19:40:02 +00:00
Chris Craik
8b581e2bc7
Merge "Early return when the scale is 0." into mnc-dr-dev
...
am: 10eb6ab94b
* commit '10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
2015-11-04 19:33:11 +00:00
Chris Craik
1938c39f77
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8
...
am: 62b16e2e10
* commit '62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
Remove -ffast-math from libhwui makefile
2015-11-04 19:33:11 +00:00
Chris Craik
10eb6ab94b
Merge "Early return when the scale is 0." into mnc-dr-dev
2015-11-04 19:28:39 +00:00
Chris Craik
62b16e2e10
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
...
am: c4aaf0f4b8
* commit 'c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
2015-11-04 19:27:19 +00:00
Chris Craik
c4aaf0f4b8
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
2015-11-04 19:20:52 +00:00
Teng-Hui Zhu
cdce35a7e8
Early return when the scale is 0.
...
b/24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit 8d0ec389531d071529fb0a800f10733b057205d9)
2015-11-04 18:31:50 +00:00
Chris Craik
e02ec7c37a
Remove -ffast-math from libhwui makefile
...
bug:25417885
Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
2015-11-04 10:14:57 -08:00
Geoff Mendal
c5b905f500
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours
...
am: cbe037b01a -s ours
* commit 'cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
Import translations. DO NOT MERGE
2015-11-04 18:12:19 +00:00
John Reck
e22d81debd
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
2015-11-04 18:11:21 +00:00
John Reck
26f50df754
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
...
am: f8635c2e04
* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
2015-11-04 18:10:52 +00:00
John Reck
632d26d1b0
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
...
am: f8635c2e04
* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
2015-11-04 18:09:49 +00:00
Geoff Mendal
7c941cd30c
Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours
...
am: d4d6fdefdf -s ours
* commit 'd4d6fdefdf83018e46e8de56f0e1679954bb398a':
Import translations. DO NOT MERGE
2015-11-04 18:08:13 +00:00
Geoff Mendal
cbe037b01a
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
am: 8e7ab07ce7 -s ours
* commit '8e7ab07ce76c20da653e098adfe38da867753305':
Import translations. DO NOT MERGE
2015-11-04 18:00:48 +00:00
John Reck
f8635c2e04
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
...
am: 1e1fbd804b
* commit '1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
2015-11-04 17:59:15 +00:00
Geoff Mendal
d4d6fdefdf
Import translations. DO NOT MERGE
...
am: 4c9cdbc7ba -s ours
* commit '4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
2015-11-04 17:57:51 +00:00
Geoff Mendal
8e7ab07ce7
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-11-04 17:47:45 +00:00
Geoff Mendal
f8f111fc2c
Import translations. DO NOT MERGE
...
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
2015-11-04 11:40:21 -06:00
John Reck
1e1fbd804b
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
2015-11-04 16:24:02 +00:00
John Reck
492a56cc93
Revert "Use clang for libhwui"
...
Bug 25462107
This reverts commit d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
2015-11-04 15:21:35 +00:00
Geoff Mendal
4c9cdbc7ba
Import translations. DO NOT MERGE
...
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
2015-11-04 06:59:32 -08:00
Diego Perez
1c442aca0a
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
2015-11-04 14:26:15 +00:00
Diego Perez
7dda46e740
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
2015-11-04 14:25:58 +00:00
Geoff Mendal
b67481b336
Merge "Import translations. DO NOT MERGE" into cw-e-dev
...
am: 931082b728 -s ours
* commit '931082b728a42e0b22b163721d7d48faf23d45a4':
Import translations. DO NOT MERGE
2015-11-04 14:09:51 +00:00
Geoff Mendal
5bf5deb84c
Import translations. DO NOT MERGE
...
am: f44adbba69 -s ours
* commit 'f44adbba69c22e4c9cd681bbb3cab70097eae118':
Import translations. DO NOT MERGE
2015-11-04 14:08:19 +00:00
Geoff Mendal
931082b728
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-11-04 13:38:21 +00:00
Geoff Mendal
3b2a1141cb
Import translations. DO NOT MERGE
...
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
2015-11-04 07:20:46 -06:00
Geoff Mendal
f44adbba69
Import translations. DO NOT MERGE
...
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
2015-11-04 05:09:10 -08:00
Diego Perez
631c2ffd6f
Update StaticLayout_Delegate to use new nLoadHyphenator
...
Small fix to update call parameters
Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
2015-11-04 11:35:34 +00:00
Riley Andrews
0394a0c399
Convert ashmem bitmap thresholds to constants.
...
Bug 25256717
Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
2015-11-03 23:52:17 -08:00
Daniel Koulomzin
d90c2da23c
ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours
...
am: 6e0a83bcd9
* commit '6e0a83bcd97574451e83d58ac646af9daf3216be':
ActivityView gets its own thread pool. DO NOT MERGE
2015-11-04 00:02:32 +00:00
Daniel Koulomzin
6e0a83bcd9
ActivityView gets its own thread pool. DO NOT MERGE
...
am: 7e19e286cc -s ours
* commit '7e19e286cc990daaafe934ed82ddfa00762907d6':
ActivityView gets its own thread pool. DO NOT MERGE
2015-11-03 23:51:39 +00:00
Daniel Koulomzin
7e19e286cc
ActivityView gets its own thread pool. DO NOT MERGE
...
Bug: 24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
2015-11-03 17:53:45 -05:00
Ian Pedowitz
d6f3e38738
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6
...
am: 95fc53b029
* commit '95fc53b0293a6361c7ff8a412897a869f07664c6':
Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:13:54 +00: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
Ian Pedowitz
966d6040c6
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
2015-11-03 21:58:30 +00:00
Tenghui Zhu
a32f221db0
Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d
...
am: a66dc6e159
* commit 'a66dc6e159bd8f4997a9253d5590807c02358d84':
Use clang for libhwui
2015-11-03 19:49:20 +00:00
Tenghui Zhu
a66dc6e159
Merge "Use clang for libhwui" into mnc-dr-dev
...
am: 61c93eb16d
* commit '61c93eb16d91bd210948af6e812517e3c03535b4':
Use clang for libhwui
2015-11-03 19:40:29 +00:00
Tenghui Zhu
61c93eb16d
Merge "Use clang for libhwui" into mnc-dr-dev
2015-11-03 19:25:43 +00:00
Ching Tzung Lin
9c7f6a409b
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
...
am: 7f54aa1e81
* commit '7f54aa1e814527371d54864bcbf9387553822ea7':
Remove circular_display_mask_offset symbol and default
2015-11-03 19:03:48 +00:00