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

4215 Commits

Author SHA1 Message Date
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Dianne Hackborn
41ca024387 am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit '726715e1138d880656a13014d447a14b3998b132':
  Few more small meminfo improvements.
 2014-11-04 02:28:18 +00:00
Dianne Hackborn
726715e113 am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev 
* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
  Few more small meminfo improvements.
 2014-11-04 02:21:11 +00:00
Dianne Hackborn
1842930762 Few more small meminfo improvements. 
- Add in category for graphics driver, and knowledge about it
  for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
  that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
 2014-11-03 13:58:11 -08:00
Svet Ganov
e73c6d93b9 am 28d51a39: am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev automerge: 4f5b8a6 
* commit '28d51a39a1bed35855b0fe75a65ad4a6d43a4460':
  Crash apps that print malformed or password protected PDFs.
 2014-11-01 00:32:52 +00:00
Svet Ganov
28d51a39a1 am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev 
automerge: 4f5b8a6

* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
  Crash apps that print malformed or password protected PDFs.
 2014-11-01 00:27:30 +00:00
Svet Ganov
182f0a136f Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev 2014-11-01 00:22:08 +00:00
Svet Ganov
fce84f035c Crash apps that print malformed or password protected PDFs. 
If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.

bug:17636435

Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
 2014-11-01 00:06:08 +00:00
John Reck
9481684560 am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0 
* commit 'e05575e9c36850d8cfe49396ac9a1372511b12bf':
  Layer changes
 2014-10-31 23:30:57 +00:00
John Reck
e05575e9c3 am a8d83d63: Merge "Layer changes" into lmp-mr1-dev 
automerge: a51fba0

* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
  Layer changes
 2014-10-31 23:25:44 +00:00
John Reck
a8d83d639a Merge "Layer changes" into lmp-mr1-dev 2014-10-31 22:55:47 +00:00
John Reck
0e89e2b7bc Layer changes 
Bug: 17208461

* Switch Layer to be VirtualLightRefBase instead of
  Caches' side-channel ref-counting
* Include active layers in gfxinfo dump
* Run gfxinfo dump on the correct thread
* Dump gfxinfo on Layer creation failure

Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
 2014-10-31 15:30:10 -07:00
Svetoslav
a3b6fc48b7 am 2a6749ad: am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev automerge: 160021d 
* commit '2a6749adc0d0693b97c81b6083629e13b604d45a':
  Save to a PDF file should look like print preview.
 2014-10-31 20:04:19 +00:00
Svetoslav
2a6749adc0 am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev 
automerge: 160021d

* commit '160021d8cf62f566587d899498c72fff82b6969f':
  Save to a PDF file should look like print preview.
 2014-10-31 19:59:53 +00:00
Svetoslav
93134ce87e Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev 2014-10-31 19:54:05 +00:00
Svetoslav
bec22beb99 Save to a PDF file should look like print preview. 
When rendering a PDF file for print preview we take into account
the selected print options such as paper size, orientation, etc
without modifying the document. To print we send the doc in its
original form and the print options so the print service can apply
the necessary transforms in addition to the optional custom options
it supports. When saving to PDF we have to actually change the
document as we act as a print service.

bug:13545980

Change-Id: Icdcecf962bec6ff742cc6015df5af9d9086ce760
 2014-10-31 10:41:34 -07:00
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:25:37 +00:00
Eric Laurent
d51558cd2a am c27169e0: am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 
* commit 'c27169e0d21f10771ca541fdc965d009ca4dc240':
  SoundTrigger JNI: fix local reference leak.
 2014-10-31 00:25:03 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Eric Laurent
c27169e0d2 am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 
* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
  SoundTrigger JNI: fix local reference leak.
 2014-10-31 00:13:30 +00:00
Dianne Hackborn
2e17445e96 am 92faa96a: am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '92faa96a26728370b2e3d002a83482e7345bfd0c':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-31 00:01:06 +00:00
Calin Juravle
100a33bd38 am 37e232dc: am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit '37e232dc9cf867a81db92988f5f014ef573e3f97':
  Use native brige only if we have a private data directory.
 2014-10-30 23:59:30 +00:00
Dianne Hackborn
92faa96a26 am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '8f53ad8e7335068b4dd96db10916c3889960de5a':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-30 23:44:20 +00:00
Calin Juravle
37e232dc9c am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit '21c3666effbcc79737af2f80f930fa9deee1622e':
  Use native brige only if we have a private data directory.
 2014-10-30 23:42:30 +00:00
Calin Juravle
c147077480 am aab0c1af: resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. 
* commit 'aab0c1af12c3a7495e0aa8b266a46e5e557323ce':
  PreInitializeNativeBridge only if its Available
 2014-10-30 23:42:15 +00:00
Calin Juravle
aab0c1af12 resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. 
Change-Id: I50095f77a43c7e116bcedb1ad7cb7b45640cf1c7
 2014-10-30 23:27:54 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
Eric Laurent
c0c1255a93 Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 2014-10-29 23:07:33 +00:00
Eric Laurent
8f89feba39 SoundTrigger JNI: fix local reference leak. 
Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
 2014-10-29 15:52:43 -07:00
Vladimir Marko
4e9176e6d5 am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'd9e8b73fd03b2c1eda7c0cb195b39c6290de61ad':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:07:32 +00:00
Vladimir Marko
d9e8b73fd0 am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:03:18 +00:00
Vladimir Marko
548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 21:57:16 +00:00
Dianne Hackborn
7ef463168c Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 2014-10-29 21:55:50 +00:00
Vladimir Marko
b4b5518c81 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
 2014-10-29 21:18:00 +00:00
Vladimir Marko
85d6f29994 Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 2014-10-29 21:12:08 +00:00
Calin Juravle
be312e43ab am bd705e5e: am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit 'bd705e5ed1906332a66b12b1b64acbe44da869f0':
  Use native brige only if we have a private data directory.
 2014-10-29 20:47:57 +00:00
Calin Juravle
bd705e5ed1 am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '5d5e4b14f67903370a7805492eb92fbe3b487a14':
  Use native brige only if we have a private data directory.
 2014-10-29 20:41:55 +00:00
Vladimir Marko
c1bcdbb758 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
 2014-10-29 20:34:15 +00:00
Calin Juravle
e41c4f2cbb am 263829e0: am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '263829e0e794f48335db2f49078c53fe10292e98':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:55:58 +00:00
Calin Juravle
263829e0e7 am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '5d4deb8246b13531a6b2b7611c650ba504e44dc6':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:47:03 +00:00
Dianne Hackborn
8e5aafe57d Condense AndroidRuntime init log, include uid running under. 
Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
 2014-10-29 10:45:25 -07:00
Calin Juravle
5d5e4b14f6 am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '43a9264619e08f464dd4f184e53441a440cca09f':
  Use native brige only if we have a private data directory.
 2014-10-29 13:21:09 +00:00
Calin Juravle
e11952ecd5 Use native brige only if we have a private data directory. 
Bug: 18027433

(cherry picked from commit 6a4d2369e5493cea86817634eceb0be46ba7d7a6)

Change-Id: I08b4e7172cd66c9006c26f07e3399848999cd74d
 2014-10-29 13:17:54 +00:00
Calin Juravle
e9d6743649 PreInitializeNativeBridge only if its Available 
Also, assert that we always have a private application directory for non
system_server case.

Bug: 18027433

(cherry picked from commit 79ec4c15ab941419d21700a9734f5238b975c31a)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
 2014-10-29 13:16:44 +00:00
Calin Juravle
6a4d2369e5 Use native brige only if we have a private data directory. 
Bug: 18027433

Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
 2014-10-29 12:40:03 +00:00
Wei Jin
5cfbcd3b9e Fix the length of a profiler system property 
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224

(cherry picked from commit 4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2)

Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
 2014-10-29 11:17:42 +00:00
Calin Juravle
5d4deb8246 am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit 'f7d24d244319599f62c22e29c3e6540d6cbadf49':
  PreInitializeNativeBridge only if its Available
 2014-10-28 19:28:42 +00:00
Calin Juravle
79ec4c15ab PreInitializeNativeBridge only if its Available 
Also, assert that we always have a private application directory for non
system_server case.

Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
 2014-10-27 14:45:33 +00:00
John Reck
675a518d5a am b64e4372: am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'b64e4372bb60bdce75e2af7d0b94efe92d94ac6a':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:23:10 +00:00
John Reck
b64e4372bb am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:15:46 +00:00