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

891 Commits

Author SHA1 Message Date
Mike Reed
70ffbf9e82 drawBitmapMatrix is deprecated, code work-around 
Change-Id: I53d827ecb74c2b131645eaf3edfd748722c5078d
 2014-12-08 17:03:30 -05:00
John Reck
1022888d33 resolved conflicts for merge of 203c8171 to master 
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
 2014-12-04 16:06:34 -08:00
Derek Sollenberger
203c817180 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 21:46:39 +00:00
Derek Sollenberger
f29d5a5b21 Update AndroidPixelRef to prevent VM from cleaning up memory prematurely. 
bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
 2014-12-03 13:43:30 -05:00
Bo Liu
2b5edf651a am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '88309159a53ceb4f34fe01056521e4b84e848ef7':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:51:37 +00:00
Bo Liu
88309159a5 am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '3813430367591efcf925b2baebc50a99a7666644':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:46:04 +00:00
Bo Liu
de92f4c72b Fix crash in getNativeCanvas when canvasHandle is NULL 
BUG: 18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
 2014-11-24 11:25:45 -08:00
Chih-hung Hsieh
3643f92882 am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '29d1b12ddae8950ee7d2a8f31a040340185a331e':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:23:53 +00:00
Chih-hung Hsieh
29d1b12dda am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:08:42 +00:00
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00
Andreas Gampe
158b6c9850 resolve merge conflicts of 7d13d9d to master. 
Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627
 2014-11-21 14:05:11 -08:00
Chih-hung Hsieh
9ebffb40d8 Revert "Frameworks/base: Mask Skia warning in GraphicsJNI" 
Should be unnecessary after c/115476.
This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
 2014-11-21 18:54:15 +00:00
Andreas Gampe
7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp 
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
 2014-11-21 10:36:14 -08:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni 
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
 2014-11-21 10:15:08 -08:00
Dan Albert
4bac6e11ae am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
* commit '3a091b79978caa9b5d58ae19f693279e5a717c2a':
  Fix clang warnings in core/jni.
 2014-11-20 23:47:07 +00:00
Dan Albert
3a091b7997 resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
 2014-11-20 15:41:25 -08:00
Dan Albert
46d8444631 Fix clang warnings in core/jni. 
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
 2014-11-20 11:47:00 -08:00
Chih-hung Hsieh
e0fd617dba am b380d7ee: am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b380d7eeee2ea73bcd2bfdf0b0b3339ab93ff75c':
  Fix incorrect usage of bool
 2014-11-19 18:15:08 +00:00
Chih-hung Hsieh
b380d7eeee am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
  Fix incorrect usage of bool
 2014-11-19 18:09:25 +00:00
Bernhard Rosenkränzer
92ddfcfff5 Fix incorrect usage of bool 
A bool can't be < 0

Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 22:01:27 +01:00
Andreas Gampe
6d6f049008 am e64565e0: Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 
* commit 'e64565e0a503397f0d59fed0e6aaef23807782b4':
  Frameworks/base: Mask pdfium warning
 2014-11-14 19:17:54 +00:00
Andreas Gampe
ed5d5fb434 am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '035a7b0235835e856f39623fc571668e2d6048da':
  Frameworks/base: Wall Werror in core/jni
 2014-11-14 19:15:42 +00:00
Andreas Gampe
f4e341d99c Frameworks/base: Mask pdfium warning 
Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
 2014-11-13 16:07:13 -08:00
Andreas Gampe
035a7b0235 am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
  Frameworks/base: Wall Werror in core/jni
 2014-11-13 23:35:22 +00:00
Andreas Gampe
0f0b491966 Frameworks/base: Wall Werror in core/jni 
Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
 2014-11-13 15:20:37 -08:00
Elliott Hughes
46c84d87e7 am 5b6683c0: am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder" 
* commit '5b6683c04a56548dbc041dda0a66a2b67444f634':
  Prevent resource leak in YuvToJpegEncoder
 2014-11-12 03:44:18 +00:00
Elliott Hughes
5b6683c04a am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder" 
* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417':
  Prevent resource leak in YuvToJpegEncoder
 2014-11-12 02:53:35 +00:00
Elliott Hughes
34acb4c8d4 Merge "Prevent resource leak in YuvToJpegEncoder" 2014-11-12 01:45:42 +00:00
Martin Wallgren
d865900425 Prevent resource leak in YuvToJpegEncoder 
SkWStream is never deleted before going out of scope

Change-Id: Ifdb75c18336d095b012e73b64281ec6c2fc5c3fe
 2014-11-11 12:37:29 +01:00
Andreas Gampe
05ff23fdad am 8c48c68c: am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 
* commit '8c48c68cc7801451d069819c4417a3a240a64294':
  Frameworks/base: Mask Skia warning in GraphicsJNI
 2014-11-11 05:26:42 +00:00
Andreas Gampe
8c48c68cc7 am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 
* commit '71f83672f297b116988defbe989869e5744cda5e':
  Frameworks/base: Mask Skia warning in GraphicsJNI
 2014-11-11 05:10:19 +00:00
Andreas Gampe
ba823cee8b Frameworks/base: Mask Skia warning in GraphicsJNI 
Do not allow unused-parameter warnings from Skia includes.

Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
 2014-11-10 21:01:06 -08:00
Derek Sollenberger
c793fcb026 Fix memory leak where we close the descriptor instead of the file. 
(cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.)

bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
 2014-11-10 08:44:46 -08:00
Dan Stoza
ceb5bdf42a am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '1437146a3e63cd932a29116f032847d4585cb4cd':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:03:49 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master 
Change-Id: I469905bef7361c18aab725778694567d1987c06d
 2014-11-06 13:04:49 -08:00
John Reck
a35778c799 Yank ResourceCache out of Caches 
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
 2014-11-06 09:45:10 -08:00
Dan Stoza
2c34b5e813 Add a BufferItem parameter to onFrameAvailable 
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
 2014-11-04 11:36:33 -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
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
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
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
Leon Scroggins III
aec202c827 am 1e2f56c5: am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev 
* commit '1e2f56c51327c40c1fc13ac03bfbc6980dcb9080':
  Decoder only returns true on complete success.
 2014-10-22 22:51:29 +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
9a23332716 am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev automerge: f408217 
automerge: 85606df

* commit '85606df57518739ef26680ac821b6f1432791ce6':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 05:55:29 +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
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
Leon Scroggins III
14494262d3 Decoder only returns true on complete success. 
Recently we added a way for SkImageDecoder::decode to distinguish
between successfully decoding the entire image and only partially
decoding the image (see https://codereview.chromium.org/647023006).

Only consider a call to decode() a success if the image was completely
decoded. This matches pre-L behavior, and lets the caller know that
they need to try to decode again.

Requires a change to external/skia (I33e6940e247b74b20361ae041f8d36eb600df49f)

BUG:17419670
Change-Id: I17ed7288b2359fafaec9551adb16d1d037800eb7
 2014-10-17 21:15:51 +00:00
Tom Hudson
73edbfeed0 Fix build breakage in HWUI JNI 
R=djsollen@google.com

Change-Id: Iaa4e7f22bec8e15748beab1b25d307c48d277c59
 2014-10-16 09:10:41 -04:00
Chris Craik
a30c08e390 am f1f54818: am a7315a14: am 86fd9278: Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev 
* commit 'f1f5481817b0d306319e49a100fb3b5fb6534d0f':
  Enable fast jni for simple RenderNode/Matrix/Paint operations
 2014-10-08 20:13:10 +00:00