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

754 Commits

Author SHA1 Message Date
chh
1d5f99b973 am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:57:42 +00:00
Chih-hung Hsieh
816219a1fa am 243a42a7: am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '243a42a7993761845e7042f1845de50aba2ffc7a':
  Fix class vs. struct mismatch
 2014-11-25 19:57:37 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:04:05 +00:00
Chih-hung Hsieh
243a42a799 am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch" 
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
 2014-11-25 19:03:57 +00:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
Bernhard Rosenkränzer
99d61edfda Fix class vs. struct mismatch 
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)

Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-24 16:18:15 -08:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters 
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-23 22:24:32 +01:00
Jeff Tinker
2670d5ad59 Merge "Fix Crash when sending null in HashMap to getKeyRequest" 2014-11-20 23:29:08 +00:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Jeff Tinker
5bec026635 Fix Crash when sending null in HashMap to getKeyRequest 
Merge of partner https://android-review.googlesource.com/#/c/115665

Change-Id: I50235dc09be584165155019a70708377ca9688a0
 2014-11-20 18:39:59 +00:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
Marco Nelissen
dce97407dc Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
 2014-11-14 14:02:09 -08:00
Mike Lockwood
3733efc8c1 am b8cb45fd: am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit 'b8cb45fddf5618ca0e8e9b36368a729785599e7c':
  MTP: Update JNI for new packet getters
 2014-11-14 00:44:51 +00:00
Mike Lockwood
b8cb45fddf am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit '0181664081db2149aa465332c33c5cb413a4348c':
  MTP: Update JNI for new packet getters
 2014-11-13 18:01:55 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Andreas Gampe
baa73b056c am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
  Frameworks/base: Wall Werror in media/jni
 2014-11-11 04:02:22 +00:00
Andreas Gampe
cba06c2272 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
 2014-11-10 19:41:52 -08:00
Andreas Gampe
5a15d0d31b Frameworks/base: Wall Werror in media/jni 
Turn on -Wall -Werror in media/jni. Fix warnings.

Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
 2014-11-10 18:19:40 -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
Jeff Tinker
9e522f3432 am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit '0d8d6ba807078b70eae53e676443ef5ac7598560':
  Add missing secure stop methods
 2014-11-06 02:54:57 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Eric Laurent
bf5d162b91 am c3a61d98: am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit 'c3a61d98387507ed0c24e54f9e056014e23d9d7a':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:15:50 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
 2014-11-05 12:20:49 -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
Jeff Tinker
1b51c72e91 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
 2014-11-03 16:22:04 -08:00
Hochi Huang
cdf4a6244d am 2a4425c1: am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 automerge: 8659bf1 
* commit '2a4425c1725e483a60cc7dec833176873148c1d4':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:47:23 +00:00
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:17:24 +00:00
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
Mike Lockwood
c6d0006245 am 5d4a1aae: am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string buffer in JNI code 
* commit '5d4a1aaed561dbbe87b05bc40ddb5dc2df46e699':
  MtpDatabase: Increase size of string buffer in JNI code
 2014-10-03 18:12:11 +00:00
Mike Lockwood
63ffd78aaa MtpDatabase: Increase size of string buffer in JNI code 
Fixes problems handling files that have full path length > 255 characters

Bug: 17383223
Change-Id: I2a1ebedee8dd86b3060f14c2d1af636fc9bc95cb
 2014-10-03 17:54:18 +00:00
Ruben Brunk
b73767f3bb am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'e60986611fe891b47f72b47873ed87deb2e3afc2':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 17:18:38 +00:00
Ruben Brunk
0c79884076 camera2: Use valid dimensions for RGBA8888 gralloc buffers. 
Bug: 17675571

- All of the mistakes were made.  Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
 2014-09-30 13:54:20 -07:00
Ruben Brunk
48ca9cd9f8 am 6c583ef7: am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 
* commit '6c583ef7ea34a2ac2eb490237908587bcbddb0e3':
  camera2: Fix native ImageReader test segfaults.
 2014-09-29 19:47:25 +00:00
Ruben Brunk
31798f3318 camera2: Fix native ImageReader test segfaults. 
Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
  when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
  incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
 2014-09-26 18:00:21 -07:00
Ruben Brunk
4656e6bb16 am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:35:00 +00:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers. 
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
 2014-09-24 10:43:12 -07:00
Eric Laurent
c206aa58fe am 7a3c88e0: am 6bc4e4b4: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev 
* commit '7a3c88e004b664d3bb20b56b029d29d629541399':
  AudioEffect JNI: fix queryEffects()
 2014-09-11 17:25:51 +00:00
Eric Laurent
4fc28d78cb AudioEffect JNI: fix queryEffects() 
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.

Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
 2014-09-10 15:05:03 -07:00
Jeff Tinker
02fe289de9 am 52b59f6c: am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev 
* commit '52b59f6cb7155bf21abff70d25f0751a3f101830':
  Add support for max-res decode
 2014-09-10 01:10:08 +00:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Jeff Tinker
44e21a21b0 am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit '576dc3188364d54137151913230b01ab18af2324':
  Fix exception message string formatting in MediaDrm
 2014-08-29 19:13:55 +00:00
Jeff Tinker
336d3eabc0 Add support for max-res decode 
bug: 16034599
Change-Id: I12124aef03518600a27de45bae24eef9c9735be5
 2014-08-29 01:42:48 +00:00
Jeff Tinker
2979986b57 Fix exception message string formatting in MediaDrm 
bug: 17281760
Change-Id: If527234d2efb1507eca8703027e3cbdd53961b9e
 2014-08-27 11:05:13 -07:00
Lajos Molnar
f642d52941 am e3cd62bf: am 4f1245eb: am 266abcaf: Merge "media: release allocated strings on error" into lmp-dev 
* commit 'e3cd62bf63706c663f85f31b7925efd85a41efc3':
  media: release allocated strings on error
 2014-08-14 18:10:20 +00:00
Mike Reed
021a3443c6 SkBitmap::Config is deprecated 
Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
 2014-08-14 09:57:06 -04:00
Lajos Molnar
018b70f5de media: release allocated strings on error 
Bug: 11990470
Change-Id: I74ffbfed8eb322d1b994fff99ed2470358bccf83
 2014-08-12 11:38:23 -07:00