159117 Commits

Author SHA1 Message Date
Chih-hung Hsieh
a58336f6c8 Merge "Use fabsf() rather than abs()" 2014-11-17 22:41:11 +00:00
Chih-hung Hsieh
1615731d18 Merge "Fix check for PROC_QUOTES mode" 2014-11-17 22:38:55 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs()
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-17 23:12:18 +01:00
Bernhard Rosenkränzer
3b1e22e289 Fix check for PROC_QUOTES mode
Since != has priority over &, the "if ((mode&PROC_QUOTES != 0))" check
is the same as "if (mode & (PROC_QUOTES!=0))" - not what the code
intends.

Change-Id: I14840a887f26c28f2bd0aee8704c79cf353164ad
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-17 22:30:56 +01: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
Ying Wang
753eda5b39 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 2014-11-17 19:35:40 +00:00
Ying Wang
d141a9033b Merge "Move preloaded-classes out of framework.jar." 2014-11-17 19:34:47 +00:00
Ying Wang
d0c45355b9 Move preloaded-classes out of framework.jar.
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
2014-11-17 11:31:08 -08:00
Andreas Gampe
65ff8ee134 Frameworks/base: AndroidRuntime standalone preloaded-classes
Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157

(cherry picked from commit 995c62d6abd4b7080e52a60d1bffa32ae4a798a3)

Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
2014-11-17 10:57:57 -08:00
Stuart Wells
7e1435ec3c Added Razer USA, Ltd serval
Change-Id: I76b7c36068c3d10ab4acb3123550ef115db0d3d2
2014-11-17 10:28:47 -08:00
Marco Nelissen
52e2b6f79d Merge "Update calls to IInterface::asBinder()" 2014-11-17 18:14:31 +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
riddle_hsu
61231a5eff Avoid deadlock between ActivityManagerService and ProcessStatsService.
Root Cause:
Case 1
getStatsOverTime(#483) // lock mWriteLock, wait AMS
async performWriteState(#269) // lock mPendingWriteLock, wait mWriteLock
writeStateLocked(#218) // lock AMS, wait mPendingWriteLock

Case 2
getStatsOverTime(#483) // lock mWriteLock, wait AMS
writeStateSyncLocked,writeStateLocked(#269) // lock AMS, wait mWriteLock

Solution:
Reduce nested lock.

Others also post the same solution:
I437a5cedceb34292a6bd1d9e7610f52b1478e424

Change-Id: Ie9395f3f6359fe59e2282674fcfec9d123e53f25
2014-11-15 18:40:08 +08:00
riddle_hsu
98f1f3400d [ActivityManager] Ensure provider external access count will be released.
Sympton: Oom-adj of provider process will be always 0.

Root Cause: Exception happend in openContentUri
may not call removeContentProviderExternalUnchecked.

Flow:
application [MediaPlayer.setDataSource(Context context, Uri uri)]
    uri is invalid, IOException will be caught and below log will appear:
    "Couldn't open file on client side, trying server side"
    Continue to call setDataSource(String path, Map<String, String> headers)
 ->mediaserver [MediaPlayerService::Client::setDataSource]
    setDataSource(httpService, url, headers) calls openContentProviderFile
 ->system_server (ActivityManagerService) [openContentUri]
    Increase externalProcessNoHandleCount for media provider.
    Call [openFile] to media provider.
 ->android.process.media [check permission for openFile]
    enforceReadPermissionInner
 ->system_server [checkComponentPermission]
    Use mediaserver's uid to check READ_EXTERNAL_STORAGE
      -> not granted due to it is pure native process, not a known package.
    Throw security exception then the flow of openContentUri is broke.
    And externalProcessNoHandleCount is unable to decrease.

Application sample code:
 String invalidId = "54321";
 Uri externalUri = MediaStore.Files.getContentUri("external");
 Uri uri = Uri.withAppendedPath(externalUri, invalidId);
 mediaPlayer.setDataSource(mContext, uri);

Solution: Move removeContentProviderExternalUnchecked to finally block.

Change-Id: I75eec1f9631e9c6bb18449946d707d51ac21e8a7
2014-11-15 18:16:49 +08:00
Miao Wang
34c495d2e9 Merge "Add Float32 suppor for IntrinsicResize. base part." 2014-11-14 18:02:13 +00:00
Andreas Gampe
5b50cd1368 Merge "Frameworks/base: Fix build" 2014-11-13 23:45:07 +00:00
Andreas Gampe
577f48c1c9 Frameworks/base: Fix build
Fix a typo.

Change-Id: Ida417c842563576b053d9f5553a2aa8d5862897c
2014-11-13 15:44:27 -08:00
Miao Wang
8f3cc4582d Add Float32 suppor for IntrinsicResize. base part.
Change-Id: I37e8826cfab92512cc641b106a42723162bffe58
2014-11-13 15:32:18 -08:00
Andreas Gampe
37079e2917 Merge "Frameworks/base: Wall Werror in packages" 2014-11-13 23:29:31 +00:00
Andreas Gampe
423ba098bd Frameworks/base: Wall Werror in packages
Turn on -Wall -Werror in packages/. Fix warnings.

Change-Id: I4ec7256a7df46017e1895575719f2b5aca978bd0
2014-11-13 15:25:34 -08:00
Andreas Gampe
0626ec5824 Merge "Frameworks/base: Wall Werror in core/jni" 2014-11-13 23:21:36 +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
Yabin Cui
537888be7d Merge "kill HAVE_LOCALTIME_R" 2014-11-13 18:14:12 +00:00
Yabin Cui
25d58a9357 kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b
2014-11-13 09:57:22 -08:00
Andreas Gampe
f0044947a7 Merge "Frameworks/base: New GL bindings" 2014-11-13 17:43:48 +00: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
5e6cf24213 Merge "Move frameworks/base over to libc++." 2014-11-12 21:11:49 +00:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
2014-11-12 11:22:20 -08:00
Nick Kralevich
6e5b14c411 Merge "Drop unused String." 2014-11-12 18:05:16 +00:00
Mike Lockwood
4951482c4d Merge "Skip receiver if failed linkToDeath to ILocationListener" 2014-11-12 17:50:20 +00:00
Andreas Gampe
b93f8d02f8 Merge "Frameworks/base: Wall Werror in common_time" 2014-11-12 17:35:15 +00:00
Andreas Gampe
4c57eda9f4 Frameworks/base: Wall Werror in common_time
Turn on warnings and errors in common_time.

Fix a code path in CommonTimeServer::handleSyncResponse in which
and uninitialized variable is returned.

Change-Id: I2f80f063c625f032266647d0507f573370202707
2014-11-12 08:04:43 -08:00
Robert Craig
f44e674fbd Drop unused String.
Change-Id: I152447bec37db33f6c4356e2a373b00ff99d7de7
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-11-12 10:43:45 -05:00
Bernhard Rosenkränzer
a8fe1b383a Remove unused variable
Remove unused variable clang complains about

Change-Id: I05ef90f45dbed0f51dace9c65a941f948fe579e7
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-12 14:39:59 +01: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
Andreas Gampe
316e75fee6 Merge "Frameworks/base: Wall Werror in rs" 2014-11-11 23:47:25 +00:00
Adam Lesinski
8aa93764ea Merge "Fixing NULL pointer access causing segmentation fault in aapt" 2014-11-11 19:36:20 +00:00
Adam Lesinski
24c16b7e4c Merge "Frameworks/base: Fix AssetManager JNI" 2014-11-11 19:35:28 +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
Johan Redestig
575bb3815a Consider RTL layout in DPAD navigation in AbsSeekBar
Changes the behavior of onKeyDown for DPAD_LEFT/RIGHT when in RTL
to move the progress in same direction as the DPAD key suggest.

Change-Id: I776a48711571884a10ef9315de78bf4ebffd6e4b
2014-11-11 12:35:56 +01:00
Wen Jing
cb3ab221f7 Skip receiver if failed linkToDeath to ILocationListener
linkToDeath may failed when app was dead immediately after
starting the call to requestLocationUpdates in Location
service. If receiver still record in maps, an exception
will occurred when try to remove receiver's update because
unlinkToDeath will failed.

Change-Id: Id9b00da3b17c1371d61ab4644a70cf9ee934cdcc
2014-11-11 10:13:49 +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
71f83672f2 Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 2014-11-11 05:02:32 +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
Andreas Gampe
67333928bf Frameworks/base: Wall Werror in rs
Turn on -Wall -Werror in rs/. Fix warnings.

Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
2014-11-10 20:35:59 -08:00