drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,951 Commits 1 Branch 0 Tags
Commit Graph

3992 Commits

Author SHA1 Message Date
Jeff Sharkey
d2d01e9bd6 am f77f306f: am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'f77f306f9803f4f9b9937b10a0a4dc545c86bd9b':
  Use sscanf() for parsing tag values.
 2014-09-09 22:07:50 +00:00
Riley Andrews
c890b81a7b am 3dec5a67: am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '3dec5a67d900e18f3aa3607aeb20fa4e6586f771':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 22:07:36 +00:00
Jeff Sharkey
30d40e707b am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'a5746ce305bc331c4cb6a5bd1fa152c17813e0f8':
  Use sscanf() for parsing tag values.
 2014-09-09 21:56:04 +00:00
Riley Andrews
4ef0f50c29 am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 21:55:38 +00:00
Jeff Sharkey
a237e05cd7 Merge "Use sscanf() for parsing tag values." into lmp-dev 2014-09-09 20:29:36 +00:00
Jeff Sharkey
e47d5435de Use sscanf() for parsing tag values. 
Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel.  We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.

Bug: 17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
 2014-09-09 12:29:41 -07:00
Riley Andrews
1d13406538 Use surfaceflinger for recents thumbnail rotations. 
+ This removes 30ms of latency on app to home transitions
  on volantis.
Change-Id: Ia3747b8f8be0d41b9b3d095753edfe1df185c84d
 2014-09-09 03:15:48 +00:00
Andreas Gampe
6b0ed64fb8 Frameworks/base: Add native bridge post-fork initialization 
(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
 2014-09-08 13:07:59 -07:00
Eric Laurent
38088d9419 am 5a8793f6: am 987ce7dc: am 2ff0e25f: Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev 
* commit '5a8793f6d5d6cb28cc6548aa2e3bfca598f9059e':
  SoundTrigger: fix capture format in recognition event
 2014-09-07 19:40:43 +00:00
Eric Laurent
b8a8f33602 am 987ce7dc: am 2ff0e25f: Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev 
* commit '987ce7dcb5485e3c593f6384eda91bfbb3f12969':
  SoundTrigger: fix capture format in recognition event
 2014-09-07 19:29:51 +00:00
Eric Laurent
8232d822aa Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev 2014-09-07 19:10:07 +00:00
Eric Laurent
39fcca0a50 SoundTrigger: fix capture format in recognition event 
Also include capture format in recognition event
if capture is available for streaming. It was only
included if trigger was contained in event.

Bug: 17409062
Bug: 16731718
Change-Id: I5bf566e6bda57f23c870b4a1293e9b6d15d51e5a
 2014-09-05 18:56:33 -07:00
Jon Miranda
8f779d8401 am 50162904: am 6eed7489: am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 
* commit '5016290424c15721021c5b7db0fe2abd759ed73d':
  Added getStyleAttributes to access all Theme attributes.
 2014-09-06 00:49:45 +00:00
John Reck
739136002f am ce7e1c41: am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev 
* commit 'ce7e1c41485cbc5dfdb6a11bde01d0d3aa5d15e6':
  Disable RT-anim for AnimatorSet
 2014-09-06 00:49:41 +00:00
Jon Miranda
d4b31eb9c4 am 6eed7489: am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 
* commit '6eed7489395f3dddffbdae8f9b50a93ed630cada':
  Added getStyleAttributes to access all Theme attributes.
 2014-09-06 00:39:40 +00:00
John Reck
ab95330acf am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev 
* commit 'bf6afec12bf123684c7e4893465dd8e1d13817bd':
  Disable RT-anim for AnimatorSet
 2014-09-06 00:39:35 +00:00
Jon Miranda
05cc48292b Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 2014-09-06 00:27:20 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
Jon Miranda
042ad633bc Added getStyleAttributes to access all Theme attributes. 
ViewDebug uses getStyleAttributes to get the attributes, and then gets the
attribute name and value so that Hierarchy Viewer can display it.

Bug: 17407087
Change-Id: I3577e32ae99668383701dc908bb46db14a75c3c4
 2014-09-05 16:19:08 -07:00
John Reck
dbeef47096 am 5e2f494e: am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit '5e2f494ecbfb37f149819b88e38868c51b97fd4e':
  Fix race condition
 2014-09-05 23:08:32 +00:00
Chris Craik
a2197d721d am 1bd57d8b: am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '1bd57d8b78d214a2bdeb0f11bba1a104b14ea84b':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 23:08:21 +00:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet 
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
 2014-09-05 15:58:26 -07:00
John Reck
07d90c4866 am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev 
* commit 'fa097eea8620158eef3592376afbcadca39b2e74':
  Fix race condition
 2014-09-05 22:56:49 +00:00
Chris Craik
33f71d9b32 am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:56:41 +00:00
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00:00
Chris Craik
83eb430270 Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 2014-09-05 22:36:41 +00:00
John Reck
ec845a215e Fix race condition 
Bug: 17372309

 AnimationContext::startFrame() happens both with and without
 the UI thread lock. Pass the TraversalMode into it so
 that ThreadedRenderer's subclass can correctly decide
 when it is safe to push over mPendingAnimatingRenderNodes, as doing
 so outside of the lock is Very Bad.

Change-Id: Ife5dd3a2b46b0a207cd9234c159a674afdbf5efd
 2014-09-05 15:23:38 -07:00
Chris Craik
5c75c52e04 Add shadow/clipping properties to HierarchyViewer 
bug:15777980

Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
 2014-09-05 15:23:08 -07:00
Christopher Ferris
8f0b7cdd43 am a6905f59: am efc1c140: am 3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 
* commit 'a6905f596ef1ff344a5646fb62e709c23b91809b':
  Add new header to support 32 bit/64 bit dumps.
 2014-09-05 17:52:32 +00:00
Christopher Ferris
be348c94b3 am efc1c140: am 3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 
* commit 'efc1c1406d11cd9a61851eb3262a0f48fc1c3d0b':
  Add new header to support 32 bit/64 bit dumps.
 2014-09-05 17:42:25 +00:00
Christopher Ferris
982f21fec2 Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 2014-09-05 17:30:21 +00:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE 
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
 2014-09-05 07:17:39 -07:00
Christopher Ferris
3b2dc9e225 Add new header to support 32 bit/64 bit dumps. 
Bug: 17319589
Change-Id: I2ca8150611794f16c148b2899e16b0a9ff77e686
 2014-09-04 18:40:57 -07:00
Andreas Gampe
c9ee16c3b5 am 3c34df69: Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit '3c34df69f398a540926854a4a27ffe8927e1a6db':
  Frameworks/base: Add native bridge post-fork initialization
 2014-09-04 23:22:05 +00:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00
Andreas Gampe
aec67dcc02 Frameworks/base: Add native bridge post-fork initialization 
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
 2014-09-03 21:38:34 -07:00
John Reck
e74166a618 am 51c4d458: am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management 
* commit '51c4d458b0fcb9b9cc393ca89afcc44c0fb80c1d':
  Fix some wrong-thread issues around animator management
 2014-09-04 01:18:35 +00:00
John Reck
cc7c225f1b am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management 
* commit '7499abd2d4604e0bdbeb91ed6c7e0155fb51dc6b':
  Fix some wrong-thread issues around animator management
 2014-09-04 00:59:19 +00:00
John Reck
e2478d45cc Fix some wrong-thread issues around animator management 
Bug: 17372309

 Fixes a case where UI thread and RT thread both used the same method
 which wasn't safe for either of them.

 Adds additional assertions & logging in unusual circumstances to
 try and track down where the issue is occuring from.

Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
 2014-09-03 17:37:59 -07:00
John Reck
385052e24b am e31c5e7e: am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit 'e31c5e7e07556d6b8775ab05cb61683b78c9bb4e':
  Have destroy call freePrefetchedLayers
 2014-09-03 19:57:34 +00:00
John Reck
842bb5be58 am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:33:24 +00:00
John Reck
17035b0211 Have destroy call freePrefetchedLayers 
Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
 2014-09-03 11:13:53 -07:00
Mathieu Chartier
a8a7a3fe40 am 2423b134: am d3f31288: am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev 
* commit '2423b1342dad08dbf5a0d09e108aeac770ea005e':
  Add missing null check to ninePatchInsets
 2014-09-03 05:03:08 +00:00
Mathieu Chartier
a31a411462 am d3f31288: am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev 
* commit 'd3f312885208afca1d195fd5ac9059dd66dcb689':
  Add missing null check to ninePatchInsets
 2014-09-02 20:26:11 +00:00
Robert Phillips
43a1d02f82 Merge "Remove use of default SkPicture ctor" 2014-09-02 19:36:39 +00:00
Mathieu Chartier
a08d10fa70 Add missing null check to ninePatchInsets 
ninePatchInsets could be null after allocation, this possibly caused
a SIGABRT in GC or check_jni failure.

Bug: 17323232

Change-Id: Icd7e3819032e8e999d3c1483bf261bb39b3fe9e4
 2014-08-29 16:57:30 -07:00
John Reck
d21fb2fe93 am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
  Animator stuff
 2014-08-28 04:17:37 +00:00
John Reck
59f71093fe am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
  Animator stuff
 2014-08-28 03:39:21 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00