OSDN Git Service
Glenn Kasten [Wed, 19 Mar 2014 19:34:07 +0000 (19:34 +0000)]
Merge "PacProcessor should be 32 bit only."
Narayan Kamath [Wed, 19 Mar 2014 11:39:43 +0000 (11:39 +0000)]
PacProcessor should be 32 bit only.
It depends on external/v8, which isn't ready for 64 bit yet.
Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81
Dianne Hackborn [Tue, 18 Mar 2014 18:28:16 +0000 (18:28 +0000)]
Merge "Insufficient ProcessRecord cleanup when persistent process is killed"
Narayan Kamath [Tue, 18 Mar 2014 09:34:43 +0000 (09:34 +0000)]
Merge "Pass int32_t for JNI calls to java Input/Output streams."
Akira Numata [Thu, 13 Mar 2014 04:36:31 +0000 (13:36 +0900)]
Insufficient ProcessRecord cleanup when persistent process is killed
When persistent process with Service restarts, ActivityManagerService
does not reset ProcessRecord#hasClientActivites to false
(because ProcessRecord of persistent process is continued using
after killing).
It disturbs updating LRU list in ActivityManagerService, and then,
when new process calls ActivityManagerProxy#publishContentProviders,
SecurityException happens because of no entry in the list.
Bug:
13517358
Change-Id: I46b064f71a4f7025ade1bf117801352a7ab22e6a
Jeff Sharkey [Mon, 17 Mar 2014 16:32:05 +0000 (16:32 +0000)]
Merge "Null pointer exception in FileRotator.java"
Ashok Bhat [Wed, 5 Mar 2014 12:40:53 +0000 (12:40 +0000)]
Pass int32_t for JNI calls to java Input/Output streams.
Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
Steve Moyer [Sun, 16 Mar 2014 17:26:43 +0000 (17:26 +0000)]
Merge "Don't attempt to launch disabled activities in smoke test."
Dave Allison [Fri, 14 Mar 2014 21:15:25 +0000 (21:15 +0000)]
Merge "Move options buffers to top scope"
Dave Allison [Fri, 14 Mar 2014 15:54:33 +0000 (08:54 -0700)]
Move options buffers to top scope
It is important that the char buffers for options do
not go out of scope as the mOptions.add() does not copy
the buffer. This moves all the buffers to the top
level scope of the function to prevent accidental
overwriting when they go out of scope.
Bug:
13448497
Change-Id: I5a97ddd32ff34f237915927906e1e1f833ff036e
Victoria Lease [Fri, 14 Mar 2014 17:48:00 +0000 (17:48 +0000)]
Merge "remove unnecessary switchUser call"
Narayan Kamath [Fri, 14 Mar 2014 14:12:35 +0000 (14:12 +0000)]
Merge "Fix layoutlib build."
Narayan Kamath [Fri, 14 Mar 2014 14:10:30 +0000 (14:10 +0000)]
Fix layoutlib build.
Was using private data structures from libcore.
Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Dave Platt [Fri, 7 Mar 2014 22:48:22 +0000 (14:48 -0800)]
NsdService does not clean up after exiting clients
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.
If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).
Bug:
9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
Mikael Gullstrand [Fri, 13 Dec 2013 09:44:50 +0000 (10:44 +0100)]
Null pointer exception in FileRotator.java
Sometimes a null pointer exception is thrown when examining files
managed by the file rotator.
The logs from the test show that the Wifi state is changed a large
number of times. On every state change, a write operation is
initiated on the file system. This will eventually result in out
of memory and the call to mBasePath.list() in the maybeRotate(...)
method in FileRotator.java will return null so the iteration will
throw a NullPointerException.
Change-Id: I5d5980d9593bc9ec75281169ca27ee591809903f
Jianzheng Zhou [Thu, 10 Oct 2013 06:02:09 +0000 (14:02 +0800)]
remove unnecessary switchUser call
If userId doesn't change, no need to do switchuser.or it will
introduce some tweak for gps modules in quick off/on because
they need cost time in off/on.
Change-Id: Ie5e408dc8be69c8a63a18bcb2cfe478cef4d70e6
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Deepanshu Gupta [Tue, 11 Mar 2014 21:22:39 +0000 (21:22 +0000)]
Merge "Fix the delegate method signatures in LayoutLib"
Narayan Kamath [Tue, 11 Mar 2014 15:09:44 +0000 (15:09 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:02:10 +0000 (15:02 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change
0efbd9a463c848118c7685f4bfc8765a82caa761.
Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
Narayan Kamath [Tue, 11 Mar 2014 12:00:54 +0000 (12:00 +0000)]
Merge "Remove stray logging statement."
Narayan Kamath [Tue, 11 Mar 2014 11:08:41 +0000 (11:08 +0000)]
Remove stray logging statement.
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
Jeff Brown [Tue, 11 Mar 2014 00:06:40 +0000 (00:06 +0000)]
Merge "Round off when calculate next step in Seekbar"
Jeff Brown [Tue, 11 Mar 2014 00:06:24 +0000 (00:06 +0000)]
Merge "Fixed typo errors in documentation"
Jeff Brown [Tue, 11 Mar 2014 00:06:01 +0000 (00:06 +0000)]
Merge "Hang off call by power button while screen is on"
Jeff Brown [Tue, 11 Mar 2014 00:04:49 +0000 (00:04 +0000)]
Merge "take account of RotationVector's new extra parameter"
Brian Carlstrom [Mon, 10 Mar 2014 17:44:30 +0000 (17:44 +0000)]
Merge "Only pass -Xprofile-* options to ART"
Brian Carlstrom [Mon, 10 Mar 2014 17:20:01 +0000 (10:20 -0700)]
Only pass -Xprofile-* options to ART
Bug:
13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
Narayan Kamath [Mon, 10 Mar 2014 10:43:57 +0000 (10:43 +0000)]
Merge "LP64: Make 9 patches architecture agnostic."
Narayan Kamath [Mon, 3 Mar 2014 17:12:03 +0000 (17:12 +0000)]
LP64: Make 9 patches architecture agnostic.
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.
These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.
Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.
This change also removed the unused patch_equals function
from aapt's Image.cpp.
Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
Dave Allison [Fri, 7 Mar 2014 22:25:42 +0000 (22:25 +0000)]
Merge "ART profiler usage."
Dave Allison [Thu, 30 Jan 2014 22:19:51 +0000 (14:19 -0800)]
ART profiler usage.
This is a change to add args to some of the profiler related
functions, including installd commands.
Also read properties and set command line options for the runtime
profiling parameters.
Changed calls to isDexOptNeeded() to isDexOptNeededInternal(). This
needs additional arguments passed for profiles.
Bug:
12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1
Conflicts:
core/jni/AndroidRuntime.cpp
Narayan Kamath [Fri, 7 Mar 2014 16:04:50 +0000 (16:04 +0000)]
Merge "Don't assume that size_t is 32-bit"
Narayan Kamath [Fri, 7 Mar 2014 16:04:27 +0000 (16:04 +0000)]
Merge "Don't use size_t for variables that store uint32_t value"
Narayan Kamath [Fri, 7 Mar 2014 13:50:03 +0000 (13:50 +0000)]
Merge "Inform libcore of time format pref. changes."
Narayan Kamath [Thu, 19 Dec 2013 14:49:36 +0000 (14:49 +0000)]
Inform libcore of time format pref. changes.
- Introduce a boolean extra for intent TIME_CHANGED that
specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat
Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
Martijn Coenen [Thu, 6 Mar 2014 14:33:10 +0000 (14:33 +0000)]
Merge "NFC: getNdefMessage() should throw exception if no tag in field."
Ashok Bhat [Wed, 5 Mar 2014 11:51:15 +0000 (11:51 +0000)]
Don't assume that size_t is 32-bit
Crypto data was being copied to java jint array in chunks of
size_t. This will not work on LP64 as size_t will be 64-bit.
This patch changes copy to use int32_t chunks instead of size_t.
Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Tue, 4 Mar 2014 21:13:52 +0000 (21:13 +0000)]
Don't use size_t for variables that store uint32_t value
The local variables width, height, displayWidth and
displayHeight are set to the corresponding members
of VideoFrame class. As the members of VideoFrame are
uint32_t, the local variables have been changed to
uint32_t.
As these local variables are passed to a java method,
the change of size_t to uint32_t ensures that the size
of the actual parameter (i.e uint32_t) is now same as
the size of the formal parameter (i.e. jint) for all
platforms.
Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Deepanshu Gupta [Thu, 6 Mar 2014 03:23:48 +0000 (19:23 -0800)]
Fix the delegate method signatures in LayoutLib
Change-Id: I262c285c1047958afdb024724959d5afb3552802
Jason Sams [Thu, 6 Mar 2014 00:50:24 +0000 (00:50 +0000)]
Merge "Validate objects are from the correct context."
Jason Sams [Thu, 6 Mar 2014 00:09:02 +0000 (16:09 -0800)]
Validate objects are from the correct context.
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
David 'Digit' Turner [Wed, 5 Mar 2014 23:10:44 +0000 (23:10 +0000)]
Merge "aidl: Support building with updated host sysroot."
David 'Digit' Turner [Tue, 4 Mar 2014 15:43:41 +0000 (16:43 +0100)]
aidl: Support building with updated host sysroot.
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).
The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.
Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.
NOTE: This doesn't break the Windows SDK build.
Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
Brian Carlstrom [Wed, 5 Mar 2014 19:23:48 +0000 (19:23 +0000)]
Merge "Add dex2oat-flags plumbing to AndroidRuntime"
Brian Carlstrom [Sat, 1 Mar 2014 07:27:22 +0000 (23:27 -0800)]
Add dex2oat-flags plumbing to AndroidRuntime
Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
Dave Platt [Tue, 4 Mar 2014 21:55:56 +0000 (21:55 +0000)]
Merge "Harden NsdManager against null-dereference crashes"
Dave Platt [Fri, 28 Feb 2014 00:16:20 +0000 (16:16 -0800)]
Harden NsdManager against null-dereference crashes
Due to race conditions or programming errors, the NsdManager
can attempt to process an asynchronous status message (and issue
a callback to the listener) after the listener has already been
removed from the NsdManager state. This causes dereferencing of
null objects, and a crash.
Split out the three async-queue message cases: these are ones
in which message.arg2 does not hold an NsdManager array index
and the code should not interpret this field as if it were.
Add an explicit check for "null listener" (the array index in the
message has already been released), log a warning, and exit early.
Safeguard accesses to the "NSD service type" string from a (possibly
null) NsdServiceInfo object... return a constant "?" string rather
than crashing.
Bug:
9016259
Change-Id: I40aabdfc65d86fdd0eaac7a1e7e56e6ff69796cf
Craig Mautner [Tue, 4 Mar 2014 15:19:17 +0000 (15:19 +0000)]
Merge "Avoid duplication of AppWindowToken in created Task"
Yevgen Pronenko [Wed, 19 Feb 2014 09:33:07 +0000 (10:33 +0100)]
Avoid duplication of AppWindowToken in created Task
When WindowManagerService creates a new Task, it passes atoken to the
Task constructor. In this case atoken is added to mAppTokens list by
the Task constructor and then it is added manually again by calling
newTask.mAppTokens.add(atoken). As a result, the same atoken is present
in mAppTokens list twice.
When another window token is added to the list, it may be placed in
beetwen duplicated tokens and corresponding window will be hidden from
the screen by corresponding duplicated windows.
From user perspective it means that some windows will not be displayed
on the screen.
The issue is fixed by avoid adding atoken to mAppTokens list manually
when it was added already in Task constructor.
Change-Id: I10628e68186160fffdde07beb7d84ab3cecb7051
Victoria Lease [Mon, 3 Mar 2014 23:38:53 +0000 (23:38 +0000)]
Merge "Add casual/cursive/sans-serif-smallcaps font families."
Tim Murray [Mon, 3 Mar 2014 19:09:07 +0000 (19:09 +0000)]
Merge "Fix null check for BaseObj.equals."
Victoria Lease [Fri, 28 Feb 2014 23:34:26 +0000 (15:34 -0800)]
Add casual/cursive/sans-serif-smallcaps font families.
Bug:
12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
Ying Wang [Sat, 1 Mar 2014 17:25:10 +0000 (17:25 +0000)]
Merge "Fix indirect misuse of $(my-dir)."
Ying Wang [Sat, 1 Mar 2014 02:04:37 +0000 (18:04 -0800)]
Fix indirect misuse of $(my-dir).
Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
Tim Murray [Sat, 1 Mar 2014 00:57:47 +0000 (16:57 -0800)]
Fix null check for BaseObj.equals.
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
Nick Kralevich [Fri, 28 Feb 2014 21:02:20 +0000 (21:02 +0000)]
Merge "Fix descriptor leak after accepting connections"
Dave Platt [Fri, 6 Dec 2013 22:03:47 +0000 (14:03 -0800)]
Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.
(cherrypicked from
3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)
Bug:
11805817
Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
Narayan Kamath [Fri, 28 Feb 2014 13:41:58 +0000 (13:41 +0000)]
Merge "Various format string fixes for 64bit"
Narayan Kamath [Fri, 28 Feb 2014 13:22:24 +0000 (13:22 +0000)]
Merge "AArch64: Use long[] for RS id array"
Xavier Ducrohet [Thu, 27 Feb 2014 23:28:13 +0000 (23:28 +0000)]
Merge "Update layoutlib method for SystemClock"
Christopher Tate [Thu, 27 Feb 2014 22:01:28 +0000 (22:01 +0000)]
Merge "Fixed upgrading from forward-lock application to system application"
Narayan Kamath [Thu, 27 Feb 2014 13:18:06 +0000 (13:18 +0000)]
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
Narayan Kamath [Thu, 27 Feb 2014 13:13:08 +0000 (13:13 +0000)]
Merge "Make getAssetInt throw unconditionally."
Ashok Bhat [Wed, 26 Feb 2014 10:00:48 +0000 (10:00 +0000)]
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script
This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.
Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Chris Craik [Wed, 26 Feb 2014 18:48:27 +0000 (18:48 +0000)]
Merge "Fix AOSP build - DO NOT MERGE"
Chris Craik [Wed, 26 Feb 2014 18:47:59 +0000 (18:47 +0000)]
Merge "Fix graphics corruption caused by HWUI caches"
Chris Craik [Wed, 26 Feb 2014 18:44:33 +0000 (10:44 -0800)]
Fix AOSP build - DO NOT MERGE
Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
Sangkyu Lee [Thu, 9 Jan 2014 05:11:57 +0000 (14:11 +0900)]
Fix graphics corruption caused by HWUI caches
Some caches(PatchCache, TextureCache, PathCache) for HWUI
uses deferred removal for their cache entries even though
actual resource objects are immediately freed by
ResourceCache.
For this reason, the uniqueness of a resource address in
the caches is not guaranteed in specific cases.
(Because malloc() can return the same address when malloc()
and free() called very frequently.)
So it can be possible the cache have two cache entries for
two different resources but the same memory address.
(Of course one of the resources is already freed.)
It also can be possible mGarbage vector in PatchCache has
duplicated addresses and this can lead to duplicated free
blocks in the free block list and graphics corruption.
(Deferred removal was implmeneted based on an assumption of
unique resource addresses.)
So this patch makes sure resource objects are freed after
the resources are removed from the caches to guarantee
the uniqueness of a resource address and prevent graphics
corruption.
Change-Id: I040f033a4fc783d2c4bc04b113589657c36fb15b
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
Narayan Kamath [Tue, 25 Feb 2014 15:48:07 +0000 (15:48 +0000)]
Make getAssetInt throw unconditionally.
All callers have been moved over to getNativeAsset, and
this method has been hidden from the public API internally.
Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
Narayan Kamath [Tue, 25 Feb 2014 13:05:47 +0000 (13:05 +0000)]
Merge "Use reinterpret_cast when an integer is cast to a pointer"
Narayan Kamath [Tue, 25 Feb 2014 13:05:43 +0000 (13:05 +0000)]
Merge "Use long for pointers in opengl/EGL classes"
Deepanshu Gupta [Mon, 24 Feb 2014 22:22:29 +0000 (14:22 -0800)]
Update layoutlib method for SystemClock
Update layoutlib to reflect changes from
http://android-review.googlesource.com/83061/
Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
Kévin PETIT [Thu, 13 Feb 2014 11:02:27 +0000 (11:02 +0000)]
Various format string fixes for 64bit
Change-Id: I74532a4e0400033f5ee3e3f6827ac42f77d16f53
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Ashok Bhat [Mon, 24 Feb 2014 10:06:55 +0000 (10:06 +0000)]
Use long for pointers in opengl/EGL classes
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen script
This patch updates EGL classes in frameworks/base to support
64-bit platforms. Key changes in the EGL classes include
[x] EGLObjectHandle class - EGLObjectHandle class has two public
methods (constructor and getHandle) that assume handles are
32-bit. They have not been changed. Instead, two new hidden
methods (EGLObjectHandle(long) and getNativeHandle) have been
added.
[x] EG14 class - Two public methods eglGetDisplay and
eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
They have been changed to throw unsupported operation exception
on non 32-bit machines. Two new methods eglGetDisplay(long)
and eglCreatePbufferFromClientBuffer(...long buffer..) have
been added to support 64-bit handles.
Change-Id: I9e0f064e5b33700eb0baa2e1841a21f931f7a765
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Mon, 24 Feb 2014 09:49:07 +0000 (09:49 +0000)]
Use reinterpret_cast when an integer is cast to a pointer
Note that files changed in this patch have been generated
by running frameworks/native/opengl/tools/glgen/gen script.
Change-Id: Iff3ac2e804af41b9a6ec073fd65019c6806fe821
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Greg Hackmann [Fri, 21 Feb 2014 21:01:00 +0000 (21:01 +0000)]
Merge changes I6d4fdada,Ia34899a4
* changes:
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Greg Hackmann [Tue, 28 Jan 2014 00:30:09 +0000 (16:30 -0800)]
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Setting the time-of-day clock is still useful on systems where the RTC
device is not yet brought up or otherwise unavailable. This matches the
in-kernel behavior of the Android alarm driver.
Change-Id: I6d4fdadab12e241ada7419425efd55bd13873c55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 20 Feb 2014 00:39:36 +0000 (16:39 -0800)]
Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls. Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.
By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.
Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).
Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Elliott Hughes [Fri, 21 Feb 2014 17:21:52 +0000 (17:21 +0000)]
Merge "Fix documentation for Parcel.readException()."
Elliott Hughes [Fri, 21 Feb 2014 17:19:21 +0000 (17:19 +0000)]
Merge "Miscellaneous small documentation fixes."
Narayan Kamath [Fri, 21 Feb 2014 15:02:30 +0000 (15:02 +0000)]
Merge "Remove unused JNITest class"
Ashok Bhat [Sat, 15 Feb 2014 11:28:48 +0000 (11:28 +0000)]
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>
Narayan Kamath [Fri, 21 Feb 2014 14:23:57 +0000 (14:23 +0000)]
Merge "Fixes for 64bit in libhwui"
Kévin PETIT [Thu, 13 Feb 2014 11:03:40 +0000 (11:03 +0000)]
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>
Steve Moyer [Fri, 21 Feb 2014 00:41:52 +0000 (16:41 -0800)]
Don't attempt to launch disabled activities in smoke test.
Also remove the superfluous runner from manifest.
Change-Id: I194b260d443d9bd4a16f62893bb2f7bcfb7ed40e
Narayan Kamath [Thu, 20 Feb 2014 12:55:27 +0000 (12:55 +0000)]
Merge "Fix several bad function definitions."
Narayan Kamath [Thu, 20 Feb 2014 12:55:20 +0000 (12:55 +0000)]
Merge "AArch64: Make AssetAtlasService 64-bit compatible"
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
(cherry picked from
017546e65280a3389b6167f5fc3b5d1c3001154a)
Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
Ashok Bhat [Mon, 27 Jan 2014 16:00:23 +0000 (16:00 +0000)]
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)
Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Thu, 20 Feb 2014 11:50:59 +0000 (11:50 +0000)]
Merge "libandroidfw: fix build error for 64-bit"
Patrik Bannura [Wed, 12 Feb 2014 12:38:54 +0000 (13:38 +0100)]
libandroidfw: fix build error for 64-bit
Fixed casting int to pointer in logging code.
Previously ints where printed as pointers and
the %p format specifier was used for convenience
to get hex output. This change uses %x and also
gets rid of the casts.
Change-Id: Ia2539769d245f50c0f3884119f80682defe69d61
Craig Mautner [Wed, 19 Feb 2014 15:36:00 +0000 (15:36 +0000)]
Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
Narayan Kamath [Wed, 19 Feb 2014 14:24:47 +0000 (14:24 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
Calin Juravle [Wed, 19 Feb 2014 11:15:00 +0000 (11:15 +0000)]
Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
Junu Kim [Wed, 19 Feb 2014 07:25:21 +0000 (16:25 +0900)]
A background started service is removed from mStartingBackground when timeout.
Fix is to make sure mStartingBackground is updated to remove one.
Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
Calin Juravle [Tue, 18 Feb 2014 19:08:39 +0000 (19:08 +0000)]
Fixed a possible infinite loop in JsonReader#skipValue()
Bug: https://code.google.com/p/android/issues/detail?id=65846
Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
Jeff Sharkey [Tue, 18 Feb 2014 17:12:14 +0000 (17:12 +0000)]
Merge "Structure device not freed in error case"
Jeff Sharkey [Tue, 18 Feb 2014 17:11:09 +0000 (17:11 +0000)]
Merge "Tethering: Skip link local addresses when enabling NAT"
Jeff Sharkey [Tue, 18 Feb 2014 17:10:02 +0000 (17:10 +0000)]
Merge "Fix, MountService now only sends one onShutDownComplete"