Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,890 Commits 3 Branches 0 Tags
00a2725683177e97e02f474332a1b64dafa0ceba
Commit Graph

59621 Commits

Author SHA1 Message Date
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
Andreas Gampe
bfe6333c3c Frameworks/base: New GL bindings 
Generated new bindings after glgen update.

Change-Id: I96f2e3eee99f1e12ad84aa10e8f7826a905e909c
 2014-11-12 14:12:45 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Elliott Hughes
34acb4c8d4 Merge "Prevent resource leak in YuvToJpegEncoder" 2014-11-12 01:45:42 +00:00
Andreas Gampe
bc0b57f336 Merge "Frameworks/base: Right transform in DngCreator" 2014-11-12 01:44:30 +00:00
Elliott Hughes
7c4ef052d5 Merge "Fix for CharSequenceCreator test case" 2014-11-12 01:38:58 +00:00
Andreas Gampe
db38706603 Merge "Frameworks/base: Fix FingerprintManager JNI" 2014-11-11 23:47:53 +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
2377cd319f Frameworks/base: Right transform in DngCreator 
Use the right calibrationTransform.

Change-Id: Ibc633ff1e02d1e48a27ae2a72585d3de2222a2c1
 2014-11-11 00:23:02 -08:00
Andreas Gampe
7c8201b61f Frameworks/base: Fix FingerprintManager JNI 
Register the right method.

Change-Id: I0806c2fa8f29ddef75caaf94092f72e644ae6d06
 2014-11-11 00:18:55 -08:00
Andreas Gampe
328126190b Frameworks/base: Fix AssetManager JNI 
Register the right method.

Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
 2014-11-11 00:16:00 -08: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
Yabin Cui
a31318620b Merge "kill HAVE_INOTIFY" 2014-11-11 00:10:12 +00:00
Yabin Cui
20a9cf4fe4 kill HAVE_INOTIFY 
Bug: 18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
 2014-11-10 16:01:10 -08:00
Yabin Cui
a9235301ad Merge "kill HAVE_SCHED_SETSCHEDULER" 2014-11-10 22:12:28 +00:00
Yabin Cui
65b4a68669 kill HAVE_SCHED_SETSCHEDULER 
Bug: 18300670

Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
 2014-11-10 12:21:57 -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
Mattias Petersson
fc2bd335d1 Fix for CharSequenceCreator test case 
The test case testCharSequenceCreator() in TextUtilsTest fails
because the data position is not reset before calling
createFromParcel().

Change-Id: I6d5cc093ff65019ab0d2191bb0bd9c10ae49612b
 2014-11-07 12:27:28 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
10ac55ba4f am 5f8099ed: Merge "Add java.util.List import." 
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.
 2014-11-03 16:00:57 +00:00
Narayan Kamath
2b4378fef8 Add java.util.List import. 
Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
 2014-11-03 15:55:03 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef815.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
Baligh Uddin
7febe5985c Import translations. DO NOT MERGE 
Change-Id: I95840329225909e062fe2221603ac91004517544
Auto-generated-cl: translation import
 2014-10-30 15:17:39 -07: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
Vladimir Marko
b4b5518c81 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb758)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
 2014-10-29 21:18:00 +00: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
43a9264619 Merge "Use native brige only if we have a private data directory." 2014-10-29 13:15:49 +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
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +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
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18b.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Calin Juravle
f7d24d2443 Merge "PreInitializeNativeBridge only if its Available" 2014-10-27 15:16:03 +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
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Elliott Hughes
ced7ebdb1d Merge "Migrate off timeFormat12 and timeFormat24." 2014-10-23 18:21:56 +00:00
Elliott Hughes
f7d5e0a53e Migrate off timeFormat12 and timeFormat24. 
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.

(cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)

Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
 2014-10-23 11:18:21 -07: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
Neil Fuller
dfcf065505 am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51':
  Replacing FloatMath native implementation with calls to Math
 2014-10-20 10:10:34 +00:00
Neil Fuller
09fd5a1873 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-20 10:08:11 +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
5fc9f9c293 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:53:38 +00:00
Elliott Hughes
84e6d466ed am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:48:03 +00:00