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

102001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
ec6c2059f9 am 3e329234: am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '3e32923425d20a77f5597af844758de395e69813':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:34:36 -07:00
kmccormick
3e32923425 am 088aef97: am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '088aef975808497caf90f03b7eb0a0175d43e01f':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:33:13 -07:00
kmccormick
088aef9758 am 96a60639: am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '96a6063943d725c9febc2bc525cb8be648c34fa5':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:31:53 -07:00
kmccormick
96a6063943 am eb46c95c: am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit 'eb46c95c8094e4dd09b5f99a362e55921d259bac':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:30:38 -07:00
kmccormick
eb46c95c80 am 4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 
* commit '4758e3e7c824bc5cb8b11b6536c5236145f2670f':
  Doc update: Add memory mgt lesson to bitmaps class
 2013-03-15 15:28:48 -07:00
kmccormick
4758e3e7c8 Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs 2013-03-15 22:26:45 +00:00
kmccormick
7571542c9d Doc update: Add memory mgt lesson to bitmaps class 
Change-Id: If780ad8bfabd66de21842bdb465d86ab24b2940c
 2013-03-15 15:10:37 -07:00
Jeff Sharkey
20a1cf345f am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 
* commit '93b04b91bc58f31e5900999849b3555065e4faa0':
  Avoid warnings about synthesized IDs.
 2013-03-15 21:49:08 +00:00
Chris Craik
ff78583d8a Fully deferred displaylist replay 
bug:8037003

A recursive drawDisplayList call is now entirely deferred before
playing back to the screen and issuing GL commands. This way, the
entire stream can be inspected, optimized, and batch work (such as
uploading textures) before issuing commands.

Additionally, this fixes an issue where operations draw could move
across restores corresponding to saveLayer(alpha). Those and other
similar cases (such as complex clipping, requiring the stencil) are
now treated as batching barriers, with the operations that change
renderer state in a way that's difficult to defer are just re-issued
at flush time.

Change-Id: Ie7348166662a5ad89fb9b1e87558334fb826b01e
 2013-03-15 14:48:18 -07:00
Jeff Sharkey
93b04b91bc Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 2013-03-15 21:47:58 +00:00
Jeff Sharkey
47b50333c1 Avoid warnings about synthesized IDs. 
Bug: 8153518
Change-Id: I5d638e17581f63c6d4a10ff6bc2c1bf9997a78b3
 2013-03-15 14:46:52 -07:00
Nick Kralevich
ac63ba15dd am fdc62ee6: am 57eed5b4: am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit 'fdc62ee6098b4fa0b7fae9731e200abd9a886218':
  app_process: don't pollute the environment
 2013-03-15 21:41:20 +00:00
Nick Kralevich
fdc62ee609 am 57eed5b4: am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit '57eed5b416bd72d4111a0aead2f5c71f24fde07b':
  app_process: don't pollute the environment
 2013-03-15 14:39:08 -07:00
Nick Kralevich
57eed5b416 am 38bfb5a7: Merge "app_process: don\'t pollute the environment" 
* commit '38bfb5a7bfc0eeab68f25afad43245efd062caef':
  app_process: don't pollute the environment
 2013-03-15 14:36:30 -07:00
Chet Haase
d9e4a5c2e5 Use same default duration (300) for animator resources as for other animators 
Issue #7492926 Animator resources should use same default duration as code-created Animators

Change-Id: I337a2c37ff26ebb6cb8b2fb2b58523c464af518b
 2013-03-15 14:33:24 -07:00
Chet Haase
2c2504744e am e8918c57: Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev 
* commit 'e8918c57bde0152a109ac05386b21c8127523018':
  Fix errors in Canvas.EdgeType docs
 2013-03-15 21:30:50 +00:00
Chet Haase
e8918c57bd Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev 2013-03-15 21:29:09 +00:00
Chet Haase
d320001807 Fix errors in Canvas.EdgeType docs 
Issue #7722363 Fix Canvas EdgeType docs

Change-Id: I2908ff22879eb5996da73a37dae1a4cabf82fffb
 2013-03-15 14:25:54 -07:00
Nick Kralevich
38bfb5a7bf Merge "app_process: don't pollute the environment" 2013-03-15 20:55:53 +00:00
Chet Haase
2076316ce1 Log warning when animator detects NaN value 
Issue #8350458 Add exception to Animators when NaN detected

Change-Id: I926c3f35b661b0bb1d9e3c7c0df55e7513734589
 2013-03-15 13:50:54 -07:00
Fabrice Di Meglio
cf60cc9ade am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 
* commit '261f82ca996a4b192b56350dd2eda6016f9d5203':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
 2013-03-15 20:37:07 +00:00
Fabrice Di Meglio
2db91af6a6 am 2d93475c: Merge "Revert "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 
* commit '2d93475c693dd2ac8555a19e0d8e7a689d3a22c3':
  Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
 2013-03-15 20:37:05 +00:00
Fabrice Di Meglio
4249050126 am fe099074: Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 
* commit 'fe099074c49b795c2ea8cf3ae9da8799bd0c6b09':
  Revert "fix argument mismatches in Paint JNI"
 2013-03-15 20:37:02 +00:00
Fabrice Di Meglio
261f82ca99 Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 2013-03-15 20:34:06 +00:00
Fabrice Di Meglio
2d93475c69 Merge "Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 2013-03-15 20:33:49 +00:00
Fabrice Di Meglio
fe099074c4 Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 2013-03-15 20:33:22 +00:00
Robert Greenwalt
1afb71377c Revert of Ifd0c4081a. Turning off logging. 
Found our bug, so switching the logging back off.
bug:8377625

Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5
 2013-03-15 20:20:11 +00:00
Nick Kralevich
9a9350550a app_process: don't pollute the environment 
Give a hoot — don't pollute!

Change-Id: I30d6c05cecab483f0e9d8063907f7bc0ef2bb104
 2013-03-15 13:14:52 -07:00
Chet Haase
caf46486f5 Reset reverse state when an animator ends 
Seeking an animation after the animator has reverse()'d to the beginning
will result in seeking in reverse. Starting the animation will make it proceed
normally, and calling reverse() will also give expected behavior. But seeking
causes this unexpected behavior because the state of reversing is not reset until
the next time the animation is played (either by start() or reverse()).

Fix is to reset the internal flag when the animator ends.

Issue #8234676 Reversing an Animator Leaves it in A Reversed State Until Explicitly Started

Change-Id: I9d212ae1879aa277d1add7eb4c7ec61432af059e
 2013-03-15 13:04:42 -07:00
Robert Greenwalt
8e338c9106 am 1b364498: Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 
* commit '1b36449830ef20473aac336f9b2585b6ad5987a5':
  Revert "Turn on more logging to find this bug."
 2013-03-15 19:24:01 +00:00
Nick Kralevich
2bc1b6e370 am fe57f62c: am 9c322c75: am f7ec4e61: Merge "Never call app_main more than once" 
* commit 'fe57f62cd854957cd64007ee23b0f70e6fcaea5b':
  Never call app_main more than once
 2013-03-15 19:23:58 +00:00
Robert Greenwalt
1b36449830 Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 2013-03-15 19:19:46 +00:00
Robert Greenwalt
15dd5be47e Revert "Turn on more logging to find this bug." 
This reverts commit bb5bcaaaed37e6215f5f253d968afcb10c1b2f3d
bug:8377625
Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
 2013-03-15 19:19:24 +00:00
Nick Kralevich
fe57f62cd8 am 9c322c75: am f7ec4e61: Merge "Never call app_main more than once" 
* commit '9c322c756276a9b22b05fd9c8bd67f2edfb50324':
  Never call app_main more than once
 2013-03-15 12:19:00 -07:00
Nick Kralevich
9c322c7562 am f7ec4e61: Merge "Never call app_main more than once" 
* commit 'f7ec4e61ebde9ff6d4934bd398e9ef8a39e4c28b':
  Never call app_main more than once
 2013-03-15 12:16:43 -07:00
Robert Greenwalt
bfbd638595 am 868adf73: Merge "Don\'t return an unmod collection." into jb-mr2-dev 
* commit '868adf7369ed9f0dcd02cee5dd36a50b892bf936':
  Don't return an unmod collection.
 2013-03-15 19:15:39 +00:00
Robert Greenwalt
868adf7369 Merge "Don't return an unmod collection." into jb-mr2-dev 2013-03-15 19:13:47 +00:00
Nick Kralevich
f7ec4e61eb Merge "Never call app_main more than once" 2013-03-15 19:08:50 +00:00
Craig Mautner
20a402e0dc am 8dfe99ce: Merge "Catch BadTokenException and continue." into jb-mr2-dev 
* commit '8dfe99ce20f2f7c08dd8d3cefcd18eb2d4fb10d8':
  Catch BadTokenException and continue.
 2013-03-15 19:02:11 +00:00
Craig Mautner
8dfe99ce20 Merge "Catch BadTokenException and continue." into jb-mr2-dev 2013-03-15 18:59:51 +00:00
Nick Kralevich
1fe21bd1b6 Never call app_main more than once 
Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.

Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.

Bug: 8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
 2013-03-15 11:59:03 -07:00
ztenghui
93a2fde962 am faf0e89c: Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 
* commit 'faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89':
  Make release() behaves the same way as other part of media framework
 2013-03-15 18:44:22 +00:00
ztenghui
faf0e89ce3 Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 2013-03-15 18:41:34 +00:00
Craig Mautner
e4bbb1cc45 Catch BadTokenException and continue. 
BadTokenException is a normal consequence of swapping IMEs while there
is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This
race condition cannot be avoided without an unacceptable lock down of
InputMethodManagerService.

Fixes bug 8387663.
Fixes bug 8263462.

Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
 2013-03-15 11:38:44 -07:00
Dianne Hackborn
ce5abb0a55 Improve/flesh-out shared library version check. 
Change-Id: I3d6eb19c8aeaae07a6d17de81ac707c7741608fb
 2013-03-15 11:37:01 -07:00
Robert Greenwalt
6629bcd660 Don't return an unmod collection. 
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:8398355

Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922
 2013-03-15 11:28:50 -07:00
Fabrice Di Meglio
da12f389eb Revert "Clean Paint.mBidiFlags as it is no longer used" 
This reverts commit 6d9fe5bd22b531bfce69b146254a4791c76acddc.
 2013-03-15 11:26:56 -07:00
Fabrice Di Meglio
19f46b0d7a Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey" 
This reverts commit ebcacc785b0883c9435a3e850f790785fba93370.
 2013-03-15 11:26:23 -07:00
Fabrice Di Meglio
a4bf8114a7 Revert "fix argument mismatches in Paint JNI" 
This reverts commit b61fb10fe435b74a761e82f517abd0320f22193e.
 2013-03-15 11:22:29 -07:00
Lorenzo Colitti
c09d7cbf2b am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev 
* commit 'c60967fd83e7a736f311a1887543df430a65164c':
  Don't update routes if Dhcp fails.
 2013-03-15 18:09:39 +00:00