OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Using the RecentsService connection to toggle recents"
Winson Chung [Tue, 18 Mar 2014 01:23:23 +0000 (01:23 +0000)]
Merge "Using the RecentsService connection to toggle recents"

10 years agoUsing the RecentsService connection to toggle recents
Winson Chung [Mon, 17 Mar 2014 17:17:11 +0000 (10:17 -0700)]
Using the RecentsService connection to toggle recents

- Adding over scroll snap back when flinging stack

Change-Id: Ife9692ece95e0a40649d0b4b72ec4ea99ffabc16

10 years agoMerge "Revert "VideoPlaneView initial implementation""
Wonsik Kim [Tue, 18 Mar 2014 01:00:58 +0000 (01:00 +0000)]
Merge "Revert "VideoPlaneView initial implementation""

10 years agoam e4b49435: am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added...
Ricardo Cervera [Tue, 18 Mar 2014 00:28:21 +0000 (00:28 +0000)]
am e4b49435: am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

* commit 'e4b49435a556816da706ac8ea6be6c99c1f06bc9':
  docs: Added release notes for SDK 22.6.1

10 years agoam 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes...
Ricardo Cervera [Tue, 18 Mar 2014 00:25:16 +0000 (00:25 +0000)]
am 86fcf070: am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

* commit '86fcf070a58fcbc621a8d406d77dfaa918710a84':
  docs: Added release notes for SDK 22.6.1

10 years agoam 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22...
Ricardo Cervera [Tue, 18 Mar 2014 00:20:52 +0000 (00:20 +0000)]
am 97a05b39: am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

* commit '97a05b39fc6f680913bba17f939ad65ceb09fc23':
  docs: Added release notes for SDK 22.6.1

10 years agoMerge "malloc some advances"
Victoria Lease [Tue, 18 Mar 2014 00:13:46 +0000 (00:13 +0000)]
Merge "malloc some advances"

10 years agoam f5f6487e: am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of...
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

10 years agoam e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDoc
Ben Murdoch [Mon, 17 Mar 2014 23:32:25 +0000 (23:32 +0000)]
am e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDoc

* commit 'e9529bc4cb28176fddf1e7916c7791e5974f2fc3':
  Fix JavaDoc

10 years agoMerge "resolved conflicts for merge of a1ca303a to master"
Doug Zongker [Mon, 17 Mar 2014 23:30:37 +0000 (23:30 +0000)]
Merge "resolved conflicts for merge of a1ca303a to master"

10 years agoresolved conflicts for merge of a1ca303a to master
Doug Zongker [Mon, 17 Mar 2014 23:24:30 +0000 (16:24 -0700)]
resolved conflicts for merge of a1ca303a to master

Change-Id: I37ef6102fd79e396fa3e50d6c012a667488a306d

10 years agoLower tap timeout to 100ms, because 180ms is a lot of ms
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

10 years agomalloc some advances
Victoria Lease [Mon, 17 Mar 2014 23:03:28 +0000 (16:03 -0700)]
malloc some advances

Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5

10 years agoMerge "Build logtags for services"
Alan Viverette [Mon, 17 Mar 2014 22:55:19 +0000 (22:55 +0000)]
Merge "Build logtags for services"

10 years agoMerge "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"

10 years agoFix 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

10 years agoBuild logtags for services
Alan Viverette [Mon, 17 Mar 2014 22:31:04 +0000 (15:31 -0700)]
Build logtags for services

Change-Id: I6a146ae46df1a9d215fcf5bab7a2ef1876b94a1e

10 years agoam f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp...
Ricardo Cervera [Mon, 17 Mar 2014 22:14:25 +0000 (22:14 +0000)]
am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

* commit 'f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
  docs: Added release notes for SDK 22.6.1

10 years agoam 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs
Ricardo Cervera [Mon, 17 Mar 2014 22:11:12 +0000 (22:11 +0000)]
am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

* commit '71a47aa7f0ea18bc4d10d87a1932c9f19554fb15':
  docs: Added release notes for SDK 22.6.1

10 years agoMerge "docs: Added release notes for SDK 22.6.1" into klp-docs
Ricardo Cervera [Mon, 17 Mar 2014 22:07:17 +0000 (22:07 +0000)]
Merge "docs: Added release notes for SDK 22.6.1" into klp-docs

10 years agoMerge "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"

10 years agodocs: Added release notes for SDK 22.6.1
Ricardo Cervera [Fri, 7 Mar 2014 22:53:35 +0000 (14:53 -0800)]
docs: Added release notes for SDK 22.6.1

Added release notes for SDK 22.6.1.

stage: http://quixote.mtv:8001/tools/sdk/eclipse-adt.html

Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Added new release notes info from Raphael.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.

Change-Id: I229c6b366c19d1d119ccd180ead04f7dd044de4e

10 years agoMerge "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."

10 years agoMerge "Remove castsShadow and globalCamera APIs"
Chris Craik [Mon, 17 Mar 2014 21:03:14 +0000 (21:03 +0000)]
Merge "Remove castsShadow and globalCamera APIs"

10 years agocamera2: Don't log vendor tag errors when camera HAL too old
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

10 years agoRemove castsShadow and globalCamera APIs
Chris Craik [Mon, 17 Mar 2014 20:17:02 +0000 (13:17 -0700)]
Remove castsShadow and globalCamera APIs

Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60

10 years agoam d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibility...
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

10 years agoam 006209c2: Merge "Remove reflection instantiation of Accessibility" into klp-modula...
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

10 years agoMerge "Remove reflection instantiation of Accessibility" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:56:09 +0000 (19:56 +0000)]
Merge "Remove reflection instantiation of Accessibility" into klp-modular-dev

10 years agoRemove reflection instantiation of Accessibility
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

10 years agoam 9229c596: (-s ours) am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2...
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

10 years agoam d292aac5: am 889a1ddd: Fix JavaDoc
Ben Murdoch [Mon, 17 Mar 2014 19:37:25 +0000 (19:37 +0000)]
am d292aac5: am 889a1ddd: Fix JavaDoc

* commit 'd292aac5eb48f6970ba4795265bd45761c063209':
  Fix JavaDoc

10 years agoam 889a1ddd: Fix JavaDoc
Ben Murdoch [Mon, 17 Mar 2014 19:34:12 +0000 (19:34 +0000)]
am 889a1ddd: Fix JavaDoc

* commit '889a1ddd00b74933d5f7daa651d98133bcb034ba':
  Fix JavaDoc

10 years agoMerge "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()"

10 years agoMerge "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""

10 years agoRevert "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

10 years agoFix JavaDoc
Ben Murdoch [Mon, 17 Mar 2014 19:20:43 +0000 (19:20 +0000)]
Fix JavaDoc

Change-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371

10 years agoMerge "Remove castsShadow and globalCamera APIs"
Chris Craik [Mon, 17 Mar 2014 19:07:26 +0000 (19:07 +0000)]
Merge "Remove castsShadow and globalCamera APIs"

10 years agoMerge "Remove deprecated BufferQueue constructor"
Dan Stoza [Mon, 17 Mar 2014 18:47:52 +0000 (18:47 +0000)]
Merge "Remove deprecated BufferQueue constructor"

10 years agoMerge "Remove deprecated BufferQueue constructor"
Dan Stoza [Mon, 17 Mar 2014 18:45:45 +0000 (18:45 +0000)]
Merge "Remove deprecated BufferQueue constructor"

10 years agoStart enforcing explicit intents for Context.bindService()
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

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 18:25:58 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 18:25:38 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoRemove castsShadow and globalCamera APIs
Chris Craik [Sat, 15 Mar 2014 01:27:50 +0000 (18:27 -0700)]
Remove castsShadow and globalCamera APIs

Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d

10 years agoMerge "Rename DisplayList->RenderNode"
John Reck [Mon, 17 Mar 2014 18:12:01 +0000 (18:12 +0000)]
Merge "Rename DisplayList->RenderNode"

10 years agoam 966bfa8d: am 01252217: Merge "Fix javadoc." into klp-modular-dev
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.

10 years agoam ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236...
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

10 years agoam 01252217: Merge "Fix javadoc." into klp-modular-dev
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.

10 years agoMerge "Standardize the provisioning intent action."
Jessica Hummel [Mon, 17 Mar 2014 18:01:27 +0000 (18:01 +0000)]
Merge "Standardize the provisioning intent action."

10 years agoMerge "Fix javadoc." into klp-modular-dev
Torne (Richard Coles) [Mon, 17 Mar 2014 17:58:29 +0000 (17:58 +0000)]
Merge "Fix javadoc." into klp-modular-dev

10 years agoam 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import translati...
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

10 years agoam ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception...
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

10 years agoam c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator...
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

10 years agoFix javadoc.
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

10 years agoRename DisplayList->RenderNode
John Reck [Fri, 14 Mar 2014 23:24:57 +0000 (16:24 -0700)]
Rename DisplayList->RenderNode

Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef

10 years agoImport translations. DO NOT MERGE
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

10 years agoMerge "Temporarily allow system apps to fully act across users."
Jessica Hummel [Mon, 17 Mar 2014 17:17:36 +0000 (17:17 +0000)]
Merge "Temporarily allow system apps to fully act across users."

10 years agoImport 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

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 17:10:24 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoCreate one hole inside the umbra area to avoid overdraw.
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoTemporarily allow system apps to fully act across users.
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

10 years agoStandardize the provisioning intent action.
Jessica Hummel [Thu, 13 Mar 2014 16:05:26 +0000 (16:05 +0000)]
Standardize the provisioning intent action.

Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4

10 years agoam 65325236: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
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

10 years agoam d88d8174: Merge "Null pointer exception in FileRotator.java"
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

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport 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

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 16:34:07 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Null pointer exception in FileRotator.java"
Jeff Sharkey [Mon, 17 Mar 2014 16:32:05 +0000 (16:32 +0000)]
Merge "Null pointer exception in FileRotator.java"

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFil...
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

10 years agoam 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 Skia...
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

10 years agoam f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into...
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

10 years agoam 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
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

10 years agoam 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG...
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

10 years agoam f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
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

10 years agoDO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
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

10 years agoUpdate framework to use M33 Skia. DO NOT MERGE
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

10 years agoRevert "VideoPlaneView initial implementation"
Wonsik Kim [Mon, 17 Mar 2014 11:17:47 +0000 (11:17 +0000)]
Revert "VideoPlaneView initial implementation"

This reverts commit 5f8aa4142919b3001fd2621f7acd5f609a5129a5.

Change-Id: I161748f365512c5e24acba2c3d9ebd9405fa8e3f

10 years agoMerge "Fixing crash when ActivityManager does not have a proper thumbnail"
Winson Chung [Mon, 17 Mar 2014 01:54:25 +0000 (01:54 +0000)]
Merge "Fixing crash when ActivityManager does not have a proper thumbnail"

10 years agoMerge "Simplifying memory management, use Task Keys as resource cache keys."
Winson Chung [Mon, 17 Mar 2014 01:54:04 +0000 (01:54 +0000)]
Merge "Simplifying memory management, use Task Keys as resource cache keys."

10 years agoam 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch...
Steve Moyer [Sun, 16 Mar 2014 17:37:55 +0000 (17:37 +0000)]
am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit '9e6bad83608bbe5da07d52c764087496a136ad42':
  Don't attempt to launch disabled activities in smoke test.

10 years agoam adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activ...
Steve Moyer [Sun, 16 Mar 2014 17:35:30 +0000 (17:35 +0000)]
am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
  Don't attempt to launch disabled activities in smoke test.

10 years agoam 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in...
Steve Moyer [Sun, 16 Mar 2014 17:31:18 +0000 (17:31 +0000)]
am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit '05d855defe8610854592ddd7baf5644ac6d4da15':
  Don't attempt to launch disabled activities in smoke test.

10 years agoam d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
Steve Moyer [Sun, 16 Mar 2014 17:29:25 +0000 (10:29 -0700)]
am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
  Don't attempt to launch disabled activities in smoke test.

10 years agoMerge "Don't attempt to launch disabled activities in smoke test."
Steve Moyer [Sun, 16 Mar 2014 17:26:43 +0000 (17:26 +0000)]
Merge "Don't attempt to launch disabled activities in smoke test."

10 years agoMerge "EthernetDataTracker: Update hardware address when interface is changed"
Jaewan Kim [Sun, 16 Mar 2014 10:23:34 +0000 (10:23 +0000)]
Merge "EthernetDataTracker: Update hardware address when interface is changed"

10 years agoMerge "Revert "Rename DisplayList->RenderNode""
John Reck [Sat, 15 Mar 2014 02:15:33 +0000 (02:15 +0000)]
Merge "Revert "Rename DisplayList->RenderNode""

10 years agoRevert "Rename DisplayList->RenderNode"
John Reck [Sat, 15 Mar 2014 02:14:53 +0000 (02:14 +0000)]
Revert "Rename DisplayList->RenderNode"

Missed some test(s), reverting to fix build

This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666

10 years agoFixing crash when ActivityManager does not have a proper thumbnail
Winson Chung [Sat, 15 Mar 2014 00:52:47 +0000 (17:52 -0700)]
Fixing crash when ActivityManager does not have a proper thumbnail

- Fixing issue with hw layers ref count not properly being incremented and decremented
- Preventing message handler from keeping a strong ref to the RecentsService

10 years agoam 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge
Craig Mautner [Sat, 15 Mar 2014 00:30:58 +0000 (00:30 +0000)]
am 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge

* commit '821df858fcc63be8cd7e53e6432a6a17d734412d':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.

10 years agoMerge "Rename DisplayList->RenderNode"
John Reck [Sat, 15 Mar 2014 00:25:33 +0000 (00:25 +0000)]
Merge "Rename DisplayList->RenderNode"

10 years agoam c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the devic...
Tim Kilbourn [Sat, 15 Mar 2014 00:24:44 +0000 (00:24 +0000)]
am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit 'c2b8df82d701eb3508da06f75b2201c3f9796373':
  FEATURE_LEANBACK implies that the device is a tv.

10 years agoam 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge...
Marco Nelissen [Sat, 15 Mar 2014 00:24:40 +0000 (00:24 +0000)]
am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '77a00cfe4b29f180b6f5ed65eddc96422453e191':
  Verify certificates

10 years agoam f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error...
Daniel 2 Olofsson [Sat, 15 Mar 2014 00:18:09 +0000 (00:18 +0000)]
am f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach

* commit 'f1b1855acc623f6137f1d51810948a8149b2a9e8':
  Re-initialize error after attach

10 years agoMerge "hal3: Add availableHotPixelModes, update modes."
Ruben Brunk [Sat, 15 Mar 2014 00:14:56 +0000 (00:14 +0000)]
Merge "hal3: Add availableHotPixelModes, update modes."

10 years agoRename DisplayList->RenderNode
John Reck [Fri, 14 Mar 2014 23:24:57 +0000 (16:24 -0700)]
Rename DisplayList->RenderNode

Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad