Narayan Kamath
f626ca2c96
Don't allow MemoryFiles of negative length.
...
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
2014-04-08 16:14:10 +01:00
Leon Scroggins III
5b93128143
am 560d1d9c: Merge "Remove SkFloatToScalar."
...
* commit '560d1d9cb24498643cea26c35a1a2481b70a9e68':
Remove SkFloatToScalar.
2014-04-08 14:43:48 +00:00
Leon Scroggins III
560d1d9cb2
Merge "Remove SkFloatToScalar."
2014-04-08 14:39:49 +00:00
Adrian Roos
6e0f14e748
Merge "Add a temporary user switcher to quick settings" into master-lockscreen-dev
2014-04-08 14:12:24 +00:00
Adrian Roos
5a46cd37c2
Add a temporary user switcher to quick settings
...
Change-Id: I7ebe29049812fe5ac98b702f3378a1121d5d6bb7
2014-04-08 16:07:46 +02:00
Yohei Yukawa
cf1b3b4791
am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
...
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
Allow IMEs to start/stop receiving onUpdateCursor callback
2014-04-08 05:52:14 +00:00
Yohei Yukawa
59fee2d553
Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
2014-04-08 05:48:45 +00:00
John Reck
95b8cfda9b
am 1f3f55b4: Merge "Enable RT, round 2"
...
* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
Enable RT, round 2
2014-04-08 02:56:33 +00:00
John Reck
1f3f55b434
Merge "Enable RT, round 2"
2014-04-08 02:50:22 +00:00
John Reck
ed8c903a6c
Enable RT, round 2
...
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
2014-04-07 19:38:59 -07:00
Baligh Uddin
93732bb43e
am 086ed8f0: (-s ours) am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '086ed8f05577394e279b9cac6fe632654dbe5b83':
Import translations. DO NOT MERGE
2014-04-08 02:31:00 +00:00
Baligh Uddin
086ed8f055
am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '56868fbcd9b086219c4350ac34b5dfdde127c5b9':
Import translations. DO NOT MERGE
2014-04-08 02:24:11 +00:00
Baligh Uddin
56868fbcd9
am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
2014-04-08 02:20:37 +00:00
Baligh Uddin
356c2f26f1
am ff17bc9c: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'ff17bc9cac2f9b178fcbfe3a0af307b4d16c2389':
Import translations. DO NOT MERGE
2014-04-08 02:20:24 +00:00
Baligh Uddin
02addbc8d9
am d0ce581e: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd0ce581e61af91158bf7e6f9ceecc4ab91d1369e':
Import translations. DO NOT MERGE
2014-04-08 02:20:21 +00:00
Baligh Uddin
ff17bc9cac
Merge "Import translations. DO NOT MERGE"
2014-04-08 02:16:43 +00:00
Baligh Uddin
f878c0a35e
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
2014-04-08 02:16:41 +00:00
Baligh Uddin
0cf836a778
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
2014-04-08 02:16:36 +00:00
Baligh Uddin
d0ce581e61
Merge "Import translations. DO NOT MERGE"
2014-04-08 02:16:33 +00:00
Baligh Uddin
42af445921
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
2014-04-08 02:16:31 +00:00
Alan Viverette
943c74345b
am a75ee14e: Update APIs to fix build
...
* commit 'a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
Update APIs to fix build
2014-04-08 02:06:14 +00:00
Alan Viverette
a75ee14e67
Update APIs to fix build
...
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
2014-04-07 18:59:51 -07:00
Eric Laurent
0d8c9222ac
am f5325314: Merge "Revert "Initial implementation of USB Audio output.""
...
* commit 'f5325314ccb6809de95c9c4fa2304fe87537640a':
Revert "Initial implementation of USB Audio output."
2014-04-08 01:27:35 +00:00
Eric Laurent
f5325314cc
Merge "Revert "Initial implementation of USB Audio output.""
2014-04-08 01:23:21 +00:00
John Reck
33ff58cdce
am e2c45526: Veto pool TODO
...
* commit 'e2c455264351964bf1ae78da2256c17258f0d3ea':
Veto pool TODO
2014-04-08 01:09:06 +00:00
Eric Laurent
f2f80c09b6
Revert "Initial implementation of USB Audio output."
...
This reverts commit 3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues 13751080 and 13883978.
Bug: 13751080.
2014-04-07 18:01:29 -07:00
Winson Chung
6736905dc0
Prevent Recents from lingering after screen-off.
...
- Fixing issue with landscape view not spanning the screen
- Simplifying the way we erase bitmaps
Change-Id: Ifc17c4c8f46caa8d3e42607a68bd94fed0c63543
2014-04-07 17:48:20 -07:00
John Reck
e2c4552643
Veto pool TODO
...
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
2014-04-07 17:38:47 -07:00
John Reck
bbd924fa8c
am 85189c5d: Merge "Fence on draws that are reported"
...
* commit '85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
Fence on draws that are reported
2014-04-08 00:37:16 +00:00
John Reck
85189c5daf
Merge "Fence on draws that are reported"
2014-04-08 00:32:15 +00:00
Alan Viverette
839ddd7495
am af22ce47: Merge "Color theming for VectorDrawable, general clean up"
...
* commit 'af22ce470112b8ee2ea7edf17b5d7c78e92d8ff7':
Color theming for VectorDrawable, general clean up
2014-04-08 00:01:38 +00:00
John Reck
28ad7b52e0
Fence on draws that are reported
...
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
2014-04-07 16:59:25 -07:00
Alan Viverette
af22ce4701
Merge "Color theming for VectorDrawable, general clean up"
2014-04-07 23:55:29 +00:00
Alan Viverette
9453b7cfd4
Color theming for VectorDrawable, general clean up
...
BUG: 13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
2014-04-07 16:50:46 -07:00
Narayan Kamath
c74221594d
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
...
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug: 13763685
Bug: 13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
2014-04-07 16:45:05 -07:00
George Mount
fa3653eafc
am f7fbe099: Merge "Allow opaque windows to become translucent."
...
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
Allow opaque windows to become translucent.
2014-04-07 23:34:35 +00:00
George Mount
f7fbe099a8
Merge "Allow opaque windows to become translucent."
2014-04-07 23:28:44 +00:00
John Reck
2736413255
am 96c637e9: Merge "Refcount RenderNode"
...
* commit '96c637e9414600a67c71014274e7757161dcc709':
Refcount RenderNode
2014-04-07 22:45:04 +00:00
John Reck
96c637e941
Merge "Refcount RenderNode"
2014-04-07 22:42:21 +00:00
Leon Scroggins III
2e0103eb34
Remove SkFloatToScalar.
...
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.
BUG:13694396
Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
2014-04-07 18:41:17 -04:00
Craig Mautner
89cca659f9
am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
...
* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
[ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:30:00 +00:00
Deepanshu Gupta
d94d1fbecd
am e9abc279: Merge "Fix theme/style resolution in Layoutlib"
...
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
Fix theme/style resolution in Layoutlib
2014-04-07 22:29:57 +00:00
Craig Mautner
8ea553d03a
am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
...
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
[ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:27:55 +00:00
Deepanshu Gupta
e9abc279fd
Merge "Fix theme/style resolution in Layoutlib"
2014-04-07 22:27:01 +00:00
Craig Mautner
8f2adcb10e
am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
...
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:21:33 +00:00
Craig Mautner
228cefa83d
am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
...
* commit '3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:14:56 +00:00
Craig Mautner
3fb2b7132b
Merge "[ActivityManager] Reduce report ANR on wrong activity."
2014-04-07 22:10:47 +00:00
John Reck
087bc0c14b
Refcount RenderNode
...
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
2014-04-07 14:53:08 -07:00
Adam Hampson
72b18e406c
am 5951c83d: am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
...
* commit '5951c83dfb38d7a3a01b5f2efc056929d20f647e':
DO NOT MERGE Fix several bad function definitions.
2014-04-07 21:44:37 +00:00
Adam Hampson
5951c83dfb
am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
...
* commit 'ec571bd203bb543aa1489e0c0a8bb67f5491630e':
DO NOT MERGE Fix several bad function definitions.
2014-04-07 21:40:00 +00:00