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

4117 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
John Reck
badac04dfd Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 2014-10-23 21:59:26 +00:00
John Reck
1125d1fa92 Add some free zoom to lockHardwareCanvas 
Bug: 18099195

Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will
never benefit. Also clean up some confusing naming

Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
 2014-10-23 13:59:47 -07:00
Leon Scroggins III
1e2f56c513 am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev 
* commit 'e8556de6f82ae0f4e4c8e76679e94abc23d724cf':
  Decoder only returns true on complete success.
 2014-10-22 22:39:10 +00:00
Leon Scroggins III
36960fad66 Merge "Decoder only returns true on complete success." into lmp-mr1-dev 2014-10-22 21:53:07 +00:00
Leon Scroggins III
85606df575 am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
automerge: f408217

* commit 'f408217411f72ec45ced7bb0d028daa59e65b56b':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 05:24:20 +00:00
Leon Scroggins III
754bffe969 am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit 'e463bc388e7f5d83f864b320dde400e390ef5817':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 02:00:46 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Leon Scroggins III
91332e7eca Report that a JavaInputStreamAdaptor is at end. 
This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
 2014-10-20 22:49:35 +00:00
Neil Fuller
1f2ad9eb74 am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
 2014-10-20 10:16:29 +00:00
Neil Fuller
38b63f0ede am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
 2014-10-20 10:16:08 +00:00
Nick Kralevich
7b3db39aa4 Replacing FloatMath native implementation with calls to Math 
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
 2014-10-20 09:24:11 +01:00
Elliott Hughes
870367567a am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:54:05 +00:00