OSDN Git Service
Adam Lesinski [Mon, 17 Mar 2014 23:36:45 +0000 (16:36 -0700)]
am
10caca13: am
f5f6487e: am
d8e585e7: am
006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit '
10caca13da7c6acde00411dfb4ab128c75b24e86':
Remove reflection instantiation of Accessibility
Ben Murdoch [Mon, 17 Mar 2014 23:36:42 +0000 (16:36 -0700)]
Doug Zongker [Mon, 17 Mar 2014 23:33:20 +0000 (16:33 -0700)]
am
11e09bd6: Merge "resolved conflicts for merge of
a1ca303a to master"
* commit '
11e09bd6d11c97fcd3ea72a00cddec4a1d63061d':
Fix javadoc.
Adam Lesinski [Mon, 17 Mar 2014 23:32:32 +0000 (23:32 +0000)]
am
f5f6487e: am
d8e585e7: am
006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit '
f5f6487e5999f6b4984e03bf6fe831ed83f5f4b6':
Remove reflection instantiation of Accessibility
Ben Murdoch [Mon, 17 Mar 2014 23:32:25 +0000 (23:32 +0000)]
Doug Zongker [Mon, 17 Mar 2014 23:30:37 +0000 (23:30 +0000)]
Merge "resolved conflicts for merge of
a1ca303a to master"
Alan Viverette [Mon, 17 Mar 2014 23:29:58 +0000 (16:29 -0700)]
am
97d9b654: Lower tap timeout to 100ms, because 180ms is a lot of ms
* commit '
97d9b65470957ce4c9983921bd59c4cf902885ce':
Lower tap timeout to 100ms, because 180ms is a lot of ms
Doug Zongker [Mon, 17 Mar 2014 23:24:30 +0000 (16:24 -0700)]
resolved conflicts for merge of
a1ca303a to master
Change-Id: I37ef6102fd79e396fa3e50d6c012a667488a306d
Alan Viverette [Mon, 17 Mar 2014 22:33:05 +0000 (15:33 -0700)]
Lower tap timeout to 100ms, because 180ms is a lot of ms
Change-Id: I708848480544825474785e0918feba70c1089090
Alan Viverette [Mon, 17 Mar 2014 22:57:59 +0000 (15:57 -0700)]
am
33e3e1b9: Merge "Build logtags for services"
* commit '
33e3e1b9203d4cb3f44c41f38ea401d101e92af2':
Build logtags for services
Alan Viverette [Mon, 17 Mar 2014 22:55:19 +0000 (22:55 +0000)]
Merge "Build logtags for services"
ztenghui [Mon, 17 Mar 2014 22:40:44 +0000 (15:40 -0700)]
am
d5a8503c: Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"
* commit '
d5a8503c7a7bff3876226ac4b47e6bce51d7d85a':
Fix the missing spot shadow when DEBUG_SHADOW is turned on
ztenghui [Mon, 17 Mar 2014 22:38:47 +0000 (22:38 +0000)]
Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"
ztenghui [Fri, 14 Mar 2014 21:35:54 +0000 (14:35 -0700)]
Fix the missing spot shadow when DEBUG_SHADOW is turned on
In the current design, this error should be tolerated since the delta should
be small enough. So we should not return here.
Change-Id: I251db2882b331d37ae7f0896e9aa95d69a5650da
Alan Viverette [Mon, 17 Mar 2014 22:31:04 +0000 (15:31 -0700)]
Build logtags for services
Change-Id: I6a146ae46df1a9d215fcf5bab7a2ef1876b94a1e
Igor Murashkin [Mon, 17 Mar 2014 21:56:19 +0000 (14:56 -0700)]
am
033a68ca: Merge "camera2: Don\'t log vendor tag errors when camera HAL too old"
* commit '
033a68ca109729aeff348b4e1a5daecc4f6b209b':
camera2: Don't log vendor tag errors when camera HAL too old
Igor Murashkin [Mon, 17 Mar 2014 21:53:47 +0000 (21:53 +0000)]
Merge "camera2: Don't log vendor tag errors when camera HAL too old"
ztenghui [Mon, 17 Mar 2014 21:15:47 +0000 (14:15 -0700)]
am
630c0aba: Merge "Create one hole inside the umbra area to avoid overdraw."
* commit '
630c0abaea1b35b4626a1d752bd04f28529801e1':
Create one hole inside the umbra area to avoid overdraw.
ztenghui [Mon, 17 Mar 2014 21:12:48 +0000 (21:12 +0000)]
Merge "Create one hole inside the umbra area to avoid overdraw."
Chris Craik [Mon, 17 Mar 2014 21:06:24 +0000 (14:06 -0700)]
am
db62c232: Merge "Remove castsShadow and globalCamera APIs"
* commit '
db62c232b953fd882a8f55daf736ae4098e8f278':
Remove castsShadow and globalCamera APIs
Chris Craik [Mon, 17 Mar 2014 21:03:14 +0000 (21:03 +0000)]
Merge "Remove castsShadow and globalCamera APIs"
Igor Murashkin [Mon, 17 Mar 2014 21:00:55 +0000 (14:00 -0700)]
camera2: Don't log vendor tag errors when camera HAL too old
Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
Chris Craik [Mon, 17 Mar 2014 20:17:02 +0000 (13:17 -0700)]
Remove castsShadow and globalCamera APIs
Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
Adam Lesinski [Mon, 17 Mar 2014 20:02:24 +0000 (20:02 +0000)]
am
d8e585e7: am
006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit '
d8e585e7e5ce77e0bf8c11838387f012b9ab9a1a':
Remove reflection instantiation of Accessibility
Adam Lesinski [Mon, 17 Mar 2014 19:58:19 +0000 (19:58 +0000)]
am
006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
* commit '
006209c2fc1b6deef10f6d52831e9cef35cca212':
Remove reflection instantiation of Accessibility
Adam Lesinski [Mon, 17 Mar 2014 19:56:09 +0000 (19:56 +0000)]
Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:54:03 +0000 (12:54 -0700)]
Remove reflection instantiation of Accessibility
Accessibility is mandatory so reflection is not required.
Change-Id: Ie5c7b0bba26809425fe0f66efcc09c333138b21f
Geoff Mendal [Mon, 17 Mar 2014 19:44:10 +0000 (12:44 -0700)]
am
40436a20: (-s ours) am
9229c596: (-s ours) am
ae327cd2: (-s ours) am
02899291: (-s ours) am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
40436a20c666c99287379838e737cc69ee10fd10':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 19:40:12 +0000 (19:40 +0000)]
am
9229c596: (-s ours) am
ae327cd2: (-s ours) am
02899291: (-s ours) am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
9229c596cb35504c23687295868c59c009a23ad5':
Import translations. DO NOT MERGE
Ben Murdoch [Mon, 17 Mar 2014 19:37:25 +0000 (19:37 +0000)]
Ben Murdoch [Mon, 17 Mar 2014 19:34:12 +0000 (19:34 +0000)]
Dianne Hackborn [Mon, 17 Mar 2014 19:33:17 +0000 (12:33 -0700)]
am
4c1d506d: Merge "Start enforcing explicit intents for Context.bindService()"
* commit '
4c1d506d7bf803f4fb5f8146fe7f81c3488c3225':
Start enforcing explicit intents for Context.bindService()
Dianne Hackborn [Mon, 17 Mar 2014 19:30:43 +0000 (19:30 +0000)]
Merge "Start enforcing explicit intents for Context.bindService()"
Chris Craik [Mon, 17 Mar 2014 19:29:52 +0000 (12:29 -0700)]
am
e0583b2c: Merge "Revert "Remove castsShadow and globalCamera APIs""
* commit '
e0583b2c93a8c0781700d8630487e9c7cfbd213f':
Revert "Remove castsShadow and globalCamera APIs"
Chris Craik [Mon, 17 Mar 2014 19:28:29 +0000 (19:28 +0000)]
Merge "Revert "Remove castsShadow and globalCamera APIs""
Chris Craik [Mon, 17 Mar 2014 19:27:49 +0000 (19:27 +0000)]
Revert "Remove castsShadow and globalCamera APIs"
This reverts commit
0334c314a5721f49b4d172a9cefe10f157cb28a4.
Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
Ben Murdoch [Mon, 17 Mar 2014 19:20:43 +0000 (19:20 +0000)]
Fix JavaDoc
Change-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371
Chris Craik [Mon, 17 Mar 2014 19:10:04 +0000 (12:10 -0700)]
am
1a1ec625: Merge "Remove castsShadow and globalCamera APIs"
* commit '
1a1ec625570e79f0f172472776f16a81a03eaa42':
Remove castsShadow and globalCamera APIs
Chris Craik [Mon, 17 Mar 2014 19:07:26 +0000 (19:07 +0000)]
Merge "Remove castsShadow and globalCamera APIs"
Dan Stoza [Mon, 17 Mar 2014 18:51:31 +0000 (11:51 -0700)]
am
8a358e44: Merge "Remove deprecated BufferQueue constructor"
* commit '
8a358e44ccd00d72300f00031bf4f40921942e01':
Remove deprecated BufferQueue constructor
Dan Stoza [Mon, 17 Mar 2014 18:47:55 +0000 (11:47 -0700)]
am
09076f72: Merge "Remove deprecated BufferQueue constructor"
* commit '
09076f72639fc80e50eb369d81127527e8757037':
Remove deprecated BufferQueue constructor
Dan Stoza [Mon, 17 Mar 2014 18:47:52 +0000 (18:47 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Dan Stoza [Mon, 17 Mar 2014 18:45:45 +0000 (18:45 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Dianne Hackborn [Mon, 17 Mar 2014 18:28:36 +0000 (11:28 -0700)]
Start enforcing explicit intents for Context.bindService()
No longer prints a warning, now throws an exception.
Also fix a bug in UserManagerService that was causing an
exception while booting.
Change-Id: I3b43cfe08067da840b6850b9bed58664d36d34f1
Geoff Mendal [Mon, 17 Mar 2014 18:28:18 +0000 (11:28 -0700)]
am
77bed997: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
77bed997bb900ecb40cdc489cff0d5b0f07986dc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 18:28:15 +0000 (11:28 -0700)]
am
699295aa: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
699295aaaa8c4d8d641441f307737ee071d7a954':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 18:25:58 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 18:25:38 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
John Reck [Mon, 17 Mar 2014 18:14:41 +0000 (11:14 -0700)]
am
0a6b0031: Merge "Rename DisplayList->RenderNode"
* commit '
0a6b0031f07f678e0ac1a24a6f2aa8bdf40c717f':
Rename DisplayList->RenderNode
Chris Craik [Sat, 15 Mar 2014 01:27:50 +0000 (18:27 -0700)]
Remove castsShadow and globalCamera APIs
Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
John Reck [Mon, 17 Mar 2014 18:12:01 +0000 (18:12 +0000)]
Merge "Rename DisplayList->RenderNode"
Torne (Richard Coles) [Mon, 17 Mar 2014 18:08:17 +0000 (18:08 +0000)]
am
966bfa8d: am
01252217: Merge "Fix javadoc." into klp-modular-dev
* commit '
966bfa8df40d3d27bacdb2d9f8eb05c3eebafd01':
Fix javadoc.
Jessica Hummel [Mon, 17 Mar 2014 18:04:44 +0000 (11:04 -0700)]
am
f1c90440: Merge "Standardize the provisioning intent action."
* commit '
f1c9044057bdffbedbe3c2cae1a7b378d593ef2b':
Standardize the provisioning intent action.
Geoff Mendal [Mon, 17 Mar 2014 18:04:23 +0000 (18:04 +0000)]
am
ae327cd2: (-s ours) am
02899291: (-s ours) am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
ae327cd206bb648a8e88e8f49f678a3ba4627a4e':
Import translations. DO NOT MERGE
Torne (Richard Coles) [Mon, 17 Mar 2014 18:02:10 +0000 (18:02 +0000)]
am
01252217: Merge "Fix javadoc." into klp-modular-dev
* commit '
01252217a5d779c885645028a5df70215e7be4f4':
Fix javadoc.
Jessica Hummel [Mon, 17 Mar 2014 18:01:27 +0000 (18:01 +0000)]
Merge "Standardize the provisioning intent action."
Jeff Sharkey [Mon, 17 Mar 2014 18:01:11 +0000 (11:01 -0700)]
am
432f755d: am
ac0f9ffd: am
da07fe64: am
eeb36c5c: am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
432f755d44d3afc20cef2b78559ad31775d3a06d':
Null pointer exception in FileRotator.java
Torne (Richard Coles) [Mon, 17 Mar 2014 17:58:29 +0000 (17:58 +0000)]
Merge "Fix javadoc." into klp-modular-dev
Geoff Mendal [Mon, 17 Mar 2014 17:57:59 +0000 (17:57 +0000)]
am
02899291: (-s ours) am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
028992915f75c858f177d0f61ea469bc47ea50b4':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 17 Mar 2014 17:57:13 +0000 (17:57 +0000)]
am
ac0f9ffd: am
da07fe64: am
eeb36c5c: am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
ac0f9ffda2a7e48d2d641654dafd11b8da39830a':
Null pointer exception in FileRotator.java
Geoff Mendal [Mon, 17 Mar 2014 17:54:58 +0000 (17:54 +0000)]
am
c3281db2: (-s ours) am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
c3281db2fb874f56d5612b9d3f07bd91067755ac':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 17 Mar 2014 17:52:56 +0000 (17:52 +0000)]
am
da07fe64: am
eeb36c5c: am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
da07fe64b09bbf75cf831067dfe678ed06950f8e':
Null pointer exception in FileRotator.java
Torne (Richard Coles) [Mon, 17 Mar 2014 17:51:40 +0000 (17:51 +0000)]
Fix javadoc.
Fix javadoc reference missing a #
Bug:
13246311
Change-Id: Ifc06234943339250feb5b4f2077af03c35be076e
John Reck [Fri, 14 Mar 2014 23:24:57 +0000 (16:24 -0700)]
Rename DisplayList->RenderNode
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
Jessica Hummel [Mon, 17 Mar 2014 17:21:13 +0000 (10:21 -0700)]
am
02b872be: Merge "Temporarily allow system apps to fully act across users."
* commit '
02b872bee14804e3f0e650986ce0f2c2914adbf4':
Temporarily allow system apps to fully act across users.
Geoff Mendal [Mon, 17 Mar 2014 17:18:49 +0000 (10:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic610f196330c190df9bf2dfcceb0dd2437250b7d
Auto-generated-cl: translation import
Jessica Hummel [Mon, 17 Mar 2014 17:17:36 +0000 (17:17 +0000)]
Merge "Temporarily allow system apps to fully act across users."
Geoff Mendal [Mon, 17 Mar 2014 17:13:35 +0000 (10:13 -0700)]
am
47e6d5d2: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
47e6d5d2748087f9fa861e6e2d3a2270748f72e5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 17:12:09 +0000 (10:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic78ab9269a3e4b81d94756bcba14123c05969387
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Mar 2014 17:10:24 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE"
ztenghui [Tue, 11 Mar 2014 23:52:30 +0000 (16:52 -0700)]
Create one hole inside the umbra area to avoid overdraw.
bug:
13439450
Change-Id: I859575196bd5a3029f447883025a6ec3a1f1face
Geoff Mendal [Mon, 17 Mar 2014 17:08:44 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0099deb9f73a8d3c6ea1ff8a8aa8808d7f1c322e
Auto-generated-cl: translation import
Jessica Hummel [Thu, 13 Mar 2014 18:09:56 +0000 (18:09 +0000)]
Temporarily allow system apps to fully act across users.
This is to allow launcher to start activities across users
and will be reverted when an alternative API is provided.
Change-Id: I67ec3e9d419afffbadce37d6e9958e2dfc096fb2
Jessica Hummel [Thu, 13 Mar 2014 16:05:26 +0000 (16:05 +0000)]
Standardize the provisioning intent action.
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
Geoff Mendal [Mon, 17 Mar 2014 16:46:53 +0000 (16:46 +0000)]
am
65325236: (-s ours) Import translations. DO NOT MERGE
* commit '
6532523652cf16d3e498939965defab4bd22c491':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 17 Mar 2014 16:39:13 +0000 (16:39 +0000)]
am
eeb36c5c: am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
Null pointer exception in FileRotator.java
Geoff Mendal [Mon, 17 Mar 2014 16:36:43 +0000 (09:36 -0700)]
am
febddd20: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
febddd200ec05d7d66325835cc4c3ffa76d4f83d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 16:36:40 +0000 (09:36 -0700)]
am
79dc65d0: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
79dc65d08ea5c7729b2dc63e57e8123e7cc9c2c3':
Import translations. DO NOT MERGE
Jeff Sharkey [Mon, 17 Mar 2014 16:36:03 +0000 (09:36 -0700)]
am
d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit '
d88d817498327462f42e50348239eac59147f310':
Null pointer exception in FileRotator.java
Geoff Mendal [Mon, 17 Mar 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 16:34:19 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Mar 2014 16:34:07 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Mon, 17 Mar 2014 16:32:05 +0000 (16:32 +0000)]
Merge "Null pointer exception in FileRotator.java"
Geoff Mendal [Mon, 17 Mar 2014 16:29:38 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifbc42b448dd9a92fce471716061797ba608cfd76
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Mar 2014 16:27:08 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I997192f031eea02fbad2f41370db984dce84b65c
Auto-generated-cl: translation import
Leon Scroggins III [Mon, 17 Mar 2014 16:06:21 +0000 (09:06 -0700)]
am
946bb3ce: am
8cee1fdc: (-s ours) am
f096ed68: am
2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
* commit '
946bb3cef9137cb12e2200cd286713aa1d74fb48':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Leon Scroggins III [Mon, 17 Mar 2014 16:06:18 +0000 (09:06 -0700)]
am
48c41b3d: am
7e6fe28b: (-s ours) am
96978ee2: am
f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '
48c41b3d33968c8ffe0aa3db70ce4e0dd36df1cc':
Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Mon, 17 Mar 2014 16:02:29 +0000 (16:02 +0000)]
am
8cee1fdc: (-s ours) am
f096ed68: am
2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
* commit '
8cee1fdc2542e5146c9b3d375819e87daeb4d1aa':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Leon Scroggins III [Mon, 17 Mar 2014 16:02:26 +0000 (16:02 +0000)]
am
7e6fe28b: (-s ours) am
96978ee2: am
f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '
7e6fe28b12bf936cc8c5c5f689a6aef6b7f21625':
Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Mon, 17 Mar 2014 15:58:36 +0000 (15:58 +0000)]
am
f096ed68: am
2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
* commit '
f096ed68e1ee5810f436ca820c1eada4b1a182a5':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Leon Scroggins III [Mon, 17 Mar 2014 15:58:32 +0000 (15:58 +0000)]
am
96978ee2: am
f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '
96978ee290ea0ef666c49ffa8733a8c74304c9f1':
Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Mon, 17 Mar 2014 15:55:46 +0000 (15:55 +0000)]
am
2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
* commit '
2fd045c092b08772be81a6d58bbb95e5e608403f':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Leon Scroggins III [Mon, 17 Mar 2014 15:55:43 +0000 (15:55 +0000)]
am
f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit '
f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:
13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:
11669944
BUG:
11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:
12807677
BUG:
12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)
Bug:
13246311
This cherry-picks 7 CLs:
-----------------------------------------------------------------------
Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.
Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.
cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
-----------------------------------------------------------------------
Merge AssetStream with AssetStreamAdaptor.
Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.
The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.
cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56
-----------------------------------------------------------------------
Deprecate Android-specific SkPaint functions.
The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);
Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.
Bug:
11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08
-----------------------------------------------------------------------
pass SkGlyphCache into updateGlyphCache()
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.
Bug:
11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
-----------------------------------------------------------------------
Updates to the Skia API needed to merge the WebView m33 version of Skia.
cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3
Bugfix for screenshots (recent apps) due to incorrect rowBytes computation
bug:
12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714
-----------------------------------------------------------------------
Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.
cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5
-----------------------------------------------------------------------
Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
Conflicts:
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Typeface.cpp
graphics/java/android/graphics/Bitmap.java
Winson Chung [Mon, 17 Mar 2014 01:56:49 +0000 (18:56 -0700)]
am
a1e4bf9b: Merge "Fixing crash when ActivityManager does not have a proper thumbnail"
* commit '
a1e4bf9b6c817f9b1558faabb949bbe516f3a187':
Fixing crash when ActivityManager does not have a proper thumbnail
Winson Chung [Mon, 17 Mar 2014 01:56:46 +0000 (18:56 -0700)]
am
0662038b: Merge "Simplifying memory management, use Task Keys as resource cache keys."
* commit '
0662038bcbfda260c2dee410da3f4006f4bd5a19':
Simplifying memory management, use Task Keys as resource cache keys.
Winson Chung [Mon, 17 Mar 2014 01:54:25 +0000 (01:54 +0000)]
Merge "Fixing crash when ActivityManager does not have a proper thumbnail"
Winson Chung [Mon, 17 Mar 2014 01:54:04 +0000 (01:54 +0000)]
Merge "Simplifying memory management, use Task Keys as resource cache keys."
Steve Moyer [Sun, 16 Mar 2014 17:40:46 +0000 (10:40 -0700)]
am
9f2b2179: am
9e6bad83: am
adb3a198: am
05d855de: am
d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
* commit '
9f2b21792e7b25dbb2d94fd8d07c881a46c467e4':
Don't attempt to launch disabled activities in smoke test.