OSDN Git Service
Michael Wright [Wed, 30 Apr 2014 19:02:56 +0000 (19:02 +0000)]
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
Elliott Hughes [Wed, 30 Apr 2014 18:59:54 +0000 (18:59 +0000)]
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
Narayan Kamath [Wed, 30 Apr 2014 13:34:04 +0000 (13:34 +0000)]
Merge "Cast CallVoidMethod's size_t parameters to jint"
Narayan Kamath [Wed, 30 Apr 2014 10:58:30 +0000 (10:58 +0000)]
Merge "Freeing frame map"
Mykola Kondratenko [Tue, 15 Apr 2014 07:35:44 +0000 (09:35 +0200)]
Freeing frame map
FileMap memory is never released until application exit
Release it now as the texture is already loaded and the memory
used for the packed resource can be released.
Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
Allen Shen [Tue, 29 Apr 2014 08:16:29 +0000 (16:16 +0800)]
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer
Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
Michael Wright [Wed, 30 Apr 2014 01:19:10 +0000 (01:19 +0000)]
Merge "NULL previous background bitmap upon changing wallpaper"
Michael Wright [Wed, 30 Apr 2014 00:01:38 +0000 (00:01 +0000)]
Merge "Add missing character combinations for international layouts"
Michael Wright [Tue, 29 Apr 2014 23:58:16 +0000 (23:58 +0000)]
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
Nick Kralevich [Tue, 29 Apr 2014 22:20:47 +0000 (22:20 +0000)]
Merge "Set NO_NEW_PRIVS on zygote init"
Nick Kralevich [Fri, 25 Apr 2014 22:01:24 +0000 (15:01 -0700)]
Set NO_NEW_PRIVS on zygote init
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
Selim Gurun [Tue, 29 Apr 2014 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add invokeFunctor stub"
Bo Liu [Tue, 29 Apr 2014 18:38:37 +0000 (11:38 -0700)]
DO NOT MERGE Add invokeFunctor stub
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
Mathieu Meisser [Tue, 17 Dec 2013 17:07:40 +0000 (18:07 +0100)]
Add missing character combinations for international layouts
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.
Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Elliott Hughes [Tue, 29 Apr 2014 03:54:49 +0000 (03:54 +0000)]
Merge "Fix two zygote imports."
Elliott Hughes [Tue, 29 Apr 2014 03:53:52 +0000 (20:53 -0700)]
Fix two zygote imports.
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
Elliott Hughes [Tue, 29 Apr 2014 03:52:10 +0000 (03:52 +0000)]
Merge "Remove unused import."
Elliott Hughes [Tue, 29 Apr 2014 03:51:34 +0000 (20:51 -0700)]
Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
Elliott Hughes [Tue, 29 Apr 2014 02:28:06 +0000 (02:28 +0000)]
Merge "Move the Zygote off libcore.os and onto android.system."
Elliott Hughes [Tue, 29 Apr 2014 02:19:13 +0000 (19:19 -0700)]
Move the Zygote off libcore.os and onto android.system.
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
Elliott Hughes [Mon, 28 Apr 2014 19:41:24 +0000 (19:41 +0000)]
Merge "Fix build."
Elliott Hughes [Mon, 28 Apr 2014 19:40:12 +0000 (12:40 -0700)]
Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
Elliott Hughes [Mon, 28 Apr 2014 18:13:59 +0000 (18:13 +0000)]
Merge "Track libcore.os' move to android.system."
Elliott Hughes [Mon, 28 Apr 2014 18:11:32 +0000 (11:11 -0700)]
Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
Mathieu Chartier [Mon, 28 Apr 2014 18:10:41 +0000 (18:10 +0000)]
Merge "Use Runtime.gc instead of System.gc for DDMS."
Mathieu Chartier [Mon, 28 Apr 2014 17:16:17 +0000 (10:16 -0700)]
Use Runtime.gc instead of System.gc for DDMS.
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.
Bug:
14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
Wink Saville [Fri, 25 Apr 2014 23:58:11 +0000 (23:58 +0000)]
Merge "Telephony: Add functionality to handle ICC IO error"
Mark Salyzyn [Fri, 25 Apr 2014 21:59:18 +0000 (21:59 +0000)]
Merge "EventLog: event log translation errors"
Mark Salyzyn [Fri, 25 Apr 2014 20:25:18 +0000 (13:25 -0700)]
EventLog: event log translation errors
- Deal with L using v3 event log format, or K using v1 or v2 event log format
Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Elliott Hughes [Wed, 23 Apr 2014 23:55:33 +0000 (23:55 +0000)]
Merge "Fix a typo in an assertion."
Elliott Hughes [Wed, 23 Apr 2014 23:54:33 +0000 (16:54 -0700)]
Fix a typo in an assertion.
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
Neil Fuller [Wed, 23 Apr 2014 16:41:16 +0000 (16:41 +0000)]
Merge "Changes to support asynchronous close interruption"
Neil Fuller [Fri, 11 Apr 2014 16:29:54 +0000 (17:29 +0100)]
Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a
Bug:
13927110
Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
Deepanshu Gupta [Tue, 22 Apr 2014 23:08:05 +0000 (23:08 +0000)]
Merge "Add missing ICU_Delegate methods."
Nick Kralevich [Tue, 22 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:23:30 +0000 (19:23 +0000)]
Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:17:51 +0000 (12:17 -0700)]
remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.
Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
Nick Kralevich [Tue, 22 Apr 2014 19:10:24 +0000 (12:10 -0700)]
remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.
Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
Zach Swasey [Fri, 18 Apr 2014 00:49:35 +0000 (17:49 -0700)]
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property enabled.
Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
Deepanshu Gupta [Mon, 21 Apr 2014 21:33:33 +0000 (14:33 -0700)]
Add missing ICU_Delegate methods.
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2
Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
Jesse Hall [Mon, 21 Apr 2014 19:38:45 +0000 (19:38 +0000)]
Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
Ying Wang [Sat, 19 Apr 2014 00:07:49 +0000 (00:07 +0000)]
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Fri, 18 Apr 2014 01:14:50 +0000 (18:14 -0700)]
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
Elliott Hughes [Fri, 18 Apr 2014 23:16:43 +0000 (23:16 +0000)]
Merge "Fix warning introduced by recent psuedolocalizer change."
Elliott Hughes [Fri, 18 Apr 2014 23:15:27 +0000 (16:15 -0700)]
Fix warning introduced by recent psuedolocalizer change.
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
Elliott Hughes [Fri, 18 Apr 2014 22:32:53 +0000 (22:32 +0000)]
Merge "Pseudolocalizer improvements."
Mark Salyzyn [Fri, 18 Apr 2014 14:55:31 +0000 (14:55 +0000)]
Merge "Native Runtime: Add LOG_ID_CRASH"
Mark Salyzyn [Fri, 18 Apr 2014 00:40:01 +0000 (00:40 +0000)]
Merge "jni: binder ptrdiff_t compile issues"
Mark Salyzyn [Fri, 18 Apr 2014 00:25:36 +0000 (17:25 -0700)]
jni: binder ptrdiff_t compile issues
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
Mark Salyzyn [Thu, 17 Apr 2014 22:52:58 +0000 (22:52 +0000)]
Merge "jni: binder 64-bit compile issues"
Mark Salyzyn [Thu, 17 Apr 2014 22:40:01 +0000 (15:40 -0700)]
jni: binder 64-bit compile issues
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
Stephen Hines [Thu, 17 Apr 2014 18:15:37 +0000 (18:15 +0000)]
Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
Stephen Hines [Thu, 17 Apr 2014 08:02:42 +0000 (01:02 -0700)]
Fix improper use of JNI_ABORT for operations where Java objects are written.
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.
Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
Jason Sams [Thu, 17 Apr 2014 01:22:18 +0000 (01:22 +0000)]
Merge "Add BiCubic resize instrinsic"
Jason Sams [Thu, 17 Apr 2014 00:13:09 +0000 (17:13 -0700)]
Add BiCubic resize instrinsic
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
Mark Salyzyn [Wed, 16 Apr 2014 19:21:44 +0000 (19:21 +0000)]
Merge "frameworks: 64 bit compile issues"
Mark Salyzyn [Wed, 16 Apr 2014 17:28:37 +0000 (10:28 -0700)]
frameworks: 64 bit compile issues
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)
Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
Mark Salyzyn [Wed, 9 Apr 2014 14:39:15 +0000 (07:39 -0700)]
Native Runtime: Add LOG_ID_CRASH
Change-Id: I4e3a82636901c5169cc6b714a4fec815cd757c58
Dmitriy Ivanov [Tue, 15 Apr 2014 19:19:53 +0000 (19:19 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 15:30:57 +0000 (08:30 -0700)]
Remove code markers
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
Mattias Nilsson [Wed, 26 Mar 2014 12:38:34 +0000 (13:38 +0100)]
Release DrmManagerClient resources
Call release for DrmManagerClient to avoid resource leaks
Introduced by following commit (
5d143ad4a8f...),
"Media scanner support for FL(Forward Lock) DRM file types"
Change-Id: Ic3c458579f4e99b3b072a2e13362d1996b982589
Jin Zhebin [Tue, 21 Jan 2014 07:27:20 +0000 (15:27 +0800)]
EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
OpenGL ES have 3 configuration: 1(EGL10.EGL_RENDERABLE_TYPE),
2(EGL_OPENGL_ES2_BIT), 3(EGL_OPENGL_ES3_BIT_KHR). The driver
should be get the according configuration parameter.
Now 1 is set to driver when Configuration 3 is set from user.
Specification EGL_OPENGL_ES3_BIT_KHR is set to driver when a OpenGL
ES 3 context is requested in setEGLContextClientVersion().
Change-Id: I980d9d8dbe5754295f8329fcf9378962d669fa89
Signed-off-by: Jin Zhebin <zhebinx.jin@intel.com>
Signed-off-by: bdeng3X <bingx.deng@intel.com>
Narayan Kamath [Mon, 14 Apr 2014 08:18:24 +0000 (08:18 +0000)]
Merge "Don't compare String8s to NULL."
Narayan Kamath [Sat, 12 Apr 2014 11:25:50 +0000 (12:25 +0100)]
Don't compare String8s to NULL.
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.
Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
Narayan Kamath [Fri, 11 Apr 2014 18:29:54 +0000 (18:29 +0000)]
Merge "Workaround 64 bit devices that don't have zygotes yet."
Narayan Kamath [Fri, 11 Apr 2014 17:44:31 +0000 (18:44 +0100)]
Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug:
13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
Elliott Hughes [Fri, 11 Apr 2014 17:37:54 +0000 (17:37 +0000)]
Merge "generateProjectThumbnail can fail to close output stream"
Elliott Hughes [Fri, 11 Apr 2014 17:30:09 +0000 (17:30 +0000)]
Merge "Add additional languages to be accepted by the NumberPicker input filter"
Elliott Hughes [Fri, 11 Apr 2014 17:14:39 +0000 (17:14 +0000)]
Merge "Add explicit close of Scanner input"
Narayan Kamath [Fri, 11 Apr 2014 08:24:52 +0000 (08:24 +0000)]
Merge "Dual zygote cleanup."
Narayan Kamath [Thu, 10 Apr 2014 11:18:28 +0000 (11:18 +0000)]
Merge "Removed android.debug.JNITest from preloaded-classes"
Narayan Kamath [Thu, 10 Apr 2014 11:13:06 +0000 (12:13 +0100)]
Dual zygote cleanup.
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
argument must be passed through to the java main class.
Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
Narayan Kamath [Thu, 10 Apr 2014 09:20:21 +0000 (09:20 +0000)]
Merge "System services detect and register app CPU ABIs"
Narayan Kamath [Thu, 10 Apr 2014 09:19:38 +0000 (09:19 +0000)]
Merge "Re-implement native library search and copies."
Anton Krumin [Wed, 12 Mar 2014 21:46:44 +0000 (14:46 -0700)]
Pseudolocalizer improvements.
Fixes accented pseudolocalization and adds RTL pseudolocale.
This change contains following modifications in the pseudolocalization logic:
1) zz_ZZ pseudolocale was removed;
2) en_XA pseudolocale was added for pseudo-accented;
3) ar_XB pseudolocale was added for pseudo-rtl;
4) Pseudo RTL localization functionality was implemented;
5) Text expansion functionality was implemented;
6) Text bracketing was implemented;
7) Couple of issues of previous implementation were fixed.
Change-Id: I9f7f27bed717e39e82717d15c398decffc8bec3c
Signed-off-by: Anton Krumin <antkrumin@google.com>
Ramin Zaghi [Tue, 1 Apr 2014 14:02:29 +0000 (15:02 +0100)]
System services detect and register app CPU ABIs
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.
This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.
Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
Ramin Zaghi [Fri, 28 Feb 2014 15:03:19 +0000 (15:03 +0000)]
Re-implement native library search and copies.
We now use a two step approach :
- First we look through the list of shared libraries in an
APK, and choose an ABI based on the (priority) list of ABIs
a given device supports.
- Then we look through the list of shared libraries and copy
all shared libraries that match the ABI we've selected.
This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.
The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).
bug: https://code.google.com/p/android/issues/detail?id=65053
bug:
13647418
Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
Mark Salyzyn [Wed, 9 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "jni: liblog reading error API incorrect"
Narayan Kamath [Wed, 9 Apr 2014 14:12:22 +0000 (14:12 +0000)]
Merge "Allow connections to multiple zygotes."
Narayan Kamath [Thu, 3 Apr 2014 19:15:15 +0000 (20:15 +0100)]
Allow connections to multiple zygotes.
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.
Both zygotes are assumed to be active at all points.
Change-Id: I460319b4481ff1c1666e8172223691820658a35c
Narayan Kamath [Wed, 9 Apr 2014 13:55:55 +0000 (13:55 +0000)]
Merge "Make zygotes aware of their supported ABIs."
Narayan Kamath [Wed, 9 Apr 2014 13:55:54 +0000 (13:55 +0000)]
Merge "Clean up argc / argv processing for runtime args."
Narayan Kamath [Mon, 7 Apr 2014 12:56:15 +0000 (13:56 +0100)]
Make zygotes aware of their supported ABIs.
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
Narayan Kamath [Mon, 7 Apr 2014 11:44:58 +0000 (12:44 +0100)]
Clean up argc / argv processing for runtime args.
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
Narayan Kamath [Wed, 9 Apr 2014 09:07:29 +0000 (09:07 +0000)]
Merge "Don't allow MemoryFiles of negative length."
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Narayan Kamath [Tue, 8 Apr 2014 15:10:52 +0000 (16:10 +0100)]
Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
Craig Mautner [Mon, 7 Apr 2014 22:10:47 +0000 (22:10 +0000)]
Merge "[ActivityManager] Reduce report ANR on wrong activity."
riddle_hsu [Mon, 7 Apr 2014 18:44:03 +0000 (02:44 +0800)]
[ActivityManager] Reduce report ANR on wrong activity.
Symptom: ANR report on wrong activity.
Root Cause:
KK changed resume behavior that will not update focus when only resume,
if the activity blocked, it may report ANR on previous focus.
By original concept, it will try to correct the ANR target,
but the stack of waiting(waitingVisible=true) activity may
different with current top stack.
If it gets key dispatch timeout, mResumedActivity and mPausingActivity
of its stack will be null becuase it is not top stack.
Then it is unable to change ANR target to the real no response activity.
Solution:
Use focused stack to get the real culprit.
Reproduce steps:
1.Launch an Activity X from launcher, press home key.
2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.
3.ANR dialog shows launcher is no response.
Change-Id: I99416ad91e349096f995990f2240a97616fbaf28