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

125747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
1fe964d11e Renaming intent to INCOMING_CALL. 
Change-Id: I90ac30be5d8503f100deedf44f8d3bd18de3fa83
 2014-02-21 12:41:33 -08:00
Alan Viverette
738bfa55f7 am 50392322: Merge "Fix scrolling when the bound target offset is too high" 
* commit '503923220cca802f6dfc12f902ab0f6d1a12434f':
  Fix scrolling when the bound target offset is too high
 2014-02-21 11:15:56 -08:00
Alan Viverette
503923220c Merge "Fix scrolling when the bound target offset is too high" 2014-02-21 19:13:17 +00:00
Alan Viverette
00b9829202 Fix scrolling when the bound target offset is too high 
BUG: 13033556
Change-Id: I7a61548d3c604f004726117b40882f84ddf75337
 2014-02-21 11:11:01 -08:00
Alan Viverette
d05ac02918 am 3a4ab768: Merge "Invalidate projection receiver, refactor invalidate methods" 
* commit '3a4ab768a95a249baceef025a8a214fa0c499a16':
  Invalidate projection receiver, refactor invalidate methods
 2014-02-21 10:52:10 -08:00
Alan Viverette
3a4ab768a9 Merge "Invalidate projection receiver, refactor invalidate methods" 2014-02-21 18:49:18 +00:00
Ruben Brunk
77a25c9d48 am 9b30512e: camera3: Fix raw/DNG tag visibilility. 
* commit '9b30512e59c96efe9d77f52b35cac0fa1f1edb96':
  camera3: Fix raw/DNG tag visibilility.
 2014-02-21 10:35:44 -08:00
Ruben Brunk
9e939998e7 am 8eb91e9f: Merge "camera3: Add green split property." 
* commit '8eb91e9f281f876322a25c78f776ea74791eaf1c':
  camera3: Add green split property.
 2014-02-21 10:35:41 -08:00
Ruben Brunk
9b30512e59 camera3: Fix raw/DNG tag visibilility. 
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
 2014-02-21 10:25:26 -08:00
Ruben Brunk
8eb91e9f28 Merge "camera3: Add green split property." 2014-02-21 18:07:05 +00:00
Evan Charlton
e9235ec700 Merge "Update API" into master-nova 2014-02-21 17:59:52 +00:00
Evan Charlton
cad4b97356 Update API 
Forgot to run update-api after 64a44a876b08f4a49238becb90bf1788b840a103

Change-Id: Id9e623b7acadb7b2d8fe5c805cf828f21833f7b9
 2014-02-21 09:58:18 -08:00
Elliott Hughes
e7c4ce8ef6 am 5784f159: am 48dcf9d5: am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit '5784f159ab9da9dd89c82926abdda26916503325':
  Fix documentation for Parcel.readException().
 2014-02-21 09:40:56 -08:00
Elliott Hughes
dd32d4679d am 449e4660: am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '449e46600f75a21975ceb1c991f768f833ed7fbf':
  Miscellaneous small documentation fixes.
 2014-02-21 09:40:53 -08:00
Elliott Hughes
5784f159ab am 48dcf9d5: am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit '48dcf9d5f59acf53a3ac0eda141ec323534a3321':
  Fix documentation for Parcel.readException().
 2014-02-21 17:37:58 +00:00
Elliott Hughes
449e46600f am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '0047d3e025b43fd2dc05734f7ea6229291445046':
  Miscellaneous small documentation fixes.
 2014-02-21 17:37:54 +00:00
Elliott Hughes
48dcf9d5f5 am d7d37256: am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit 'd7d37256c4bab388e99dae5e16b80a59756cc97d':
  Fix documentation for Parcel.readException().
 2014-02-21 17:33:41 +00:00
Elliott Hughes
0047d3e025 am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit 'e253b514f4ef74a23c784d2cd893eb035d1c793f':
  Miscellaneous small documentation fixes.
 2014-02-21 17:33:38 +00:00
Elliott Hughes
d7d37256c4 am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit 'b2f07b27725bed9716114c46df2cf636eb366f6f':
  Fix documentation for Parcel.readException().
 2014-02-21 17:28:54 +00:00
Elliott Hughes
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
 2014-02-21 17:28:51 +00:00
Elliott Hughes
b2f07b2772 am 4a809272: Merge "Fix documentation for Parcel.readException()." 
* commit '4a80927241b3168d9d5138c46c22385d6467a736':
  Fix documentation for Parcel.readException().
 2014-02-21 09:25:54 -08:00
Elliott Hughes
29d60b95fa am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '8d41e653bae240488281d430309e2d501e9524e5':
  Miscellaneous small documentation fixes.
 2014-02-21 09:25:50 -08:00
Elliott Hughes
4a80927241 Merge "Fix documentation for Parcel.readException()." 2014-02-21 17:21:52 +00:00
Robin Lee
96022277b9 am c53bd971: Merge "Check DeviceOwner exists before using packageName" 
* commit 'c53bd971ba4dd5dcbd84857052baa4aa9d55d41a':
  Check DeviceOwner exists before using packageName
 2014-02-21 09:20:34 -08:00
Craig Mautner
badfbb10e9 am ae39c628: am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them. 
* commit 'ae39c6283b4f2a0166a604e16aeb099d2347921a':
  Add copyright notice to files missing them.
 2014-02-21 09:20:31 -08:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Robin Lee
c53bd971ba Merge "Check DeviceOwner exists before using packageName" 2014-02-21 17:16:11 +00:00
Craig Mautner
ae39c6283b am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them. 
* commit 'c72f5c2de565ab3c46176155f3414cc154b5df39':
  Add copyright notice to files missing them.
 2014-02-21 17:06:08 +00:00
Narayan Kamath
c61eef5206 am 2b20f6db: am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '2b20f6db9c152b6ac89b0999a73894b3db047aa5':
  Remove unused JNITest class
 2014-02-21 09:02:29 -08:00
Narayan Kamath
cd79d609db am 35eeb2d8: am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '35eeb2d859d0e535b4d23bfd52db76db38b1551c':
  Fixes for 64bit in libhwui
 2014-02-21 09:02:26 -08:00
Craig Mautner
c72f5c2de5 am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them. 
* commit 'ec5c3b9040625e53e3f5cff1fe3d963b936065f0':
  Add copyright notice to files missing them.
 2014-02-21 17:01:48 +00:00
Narayan Kamath
2b20f6db9c am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit 'a1aeac80df09cf8d481474264b1ce78ed64e7464':
  Remove unused JNITest class
 2014-02-21 16:58:33 +00:00
Narayan Kamath
35eeb2d859 am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
  Fixes for 64bit in libhwui
 2014-02-21 16:58:28 +00:00
Craig Mautner
ec5c3b9040 am c2c0a61c: Add copyright notice to files missing them. 
* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
  Add copyright notice to files missing them.
 2014-02-21 16:55:55 +00:00
Narayan Kamath
a1aeac80df am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '25c55ca902f570d3a89753c6eb9492c20dd734ba':
  Remove unused JNITest class
 2014-02-21 16:53:43 +00:00
Narayan Kamath
6191044729 am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '7942397b3174a9642996979ae8b4aafb313dc2e2':
  Fixes for 64bit in libhwui
 2014-02-21 16:53:40 +00:00
Narayan Kamath
25c55ca902 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
 2014-02-21 16:47:43 +00:00
Narayan Kamath
7942397b31 am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui
 2014-02-21 16:47:38 +00:00
Narayan Kamath
911b2ce3da am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class
 2014-02-21 08:34:36 -08:00
Narayan Kamath
1925634079 am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui
 2014-02-21 08:34:30 -08:00
Narayan Kamath
4a642ee5e6 Merge "Remove unused JNITest class" 2014-02-21 15:02:31 +00:00
Narayan Kamath
57d7e2c755 am 2fb1fa6c: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit '2fb1fa6c88901fd16f1756a744a5f066f95c9253':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-21 06:36:55 -08:00
Ashok Bhat
42f06b0e22 Remove unused JNITest class 
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-21 14:34:35 +00:00
Narayan Kamath
22c6663909 Merge "Fixes for 64bit in libhwui" 2014-02-21 14:23:57 +00:00
Narayan Kamath
2fb1fa6c88 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-21 14:15:44 +00:00
Derek Sollenberger
b9ba8fe779 am 52382757: Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer."" 
* commit '52382757753b54be7d5ed4c2cc8496cab36192d8':
  Reapply "Refactor setting an SkPaint onto a hwui Layer."
 2014-02-21 05:29:45 -08:00
Narayan Kamath
53d2f85337 am 5c799493: Merge "Make LruCache.resize(int) public" 
* commit '5c79949324066adc536ba563736f8f1f688fef02':
  Make LruCache.resize(int) public
 2014-02-21 05:29:41 -08:00
Derek Sollenberger
5238275775 Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-21 13:15:33 +00:00
Kévin PETIT
73fc558e44 Fixes for 64bit in libhwui 
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.

Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-02-21 13:07:29 +00:00
Ashok Bhat
17ab38f8a8 AArch64: Make AssetAtlasService 64-bit compatible 
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
 2014-02-21 13:02:34 +00:00