summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
| | | | | | | | | | | | | | | | | 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>
* Merge "Validate objects are from the correct context."Jason Sams2014-03-062-0/+17
|\
| * Validate objects are from the correct context.Jason Sams2014-03-052-0/+17
| | | | | | | | Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
* | Merge "aidl: Support building with updated host sysroot."David 'Digit' Turner2014-03-051-0/+2
|\ \
| * | aidl: Support building with updated host sysroot.David 'Digit' Turner2014-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add dex2oat-flags plumbing to AndroidRuntime"Brian Carlstrom2014-03-052-7/+28
|\ \ \ | |_|/ |/| |
| * | Add dex2oat-flags plumbing to AndroidRuntimeBrian Carlstrom2014-03-042-7/+28
|/ / | | | | | | Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
* | Merge "Harden NsdManager against null-dereference crashes"Dave Platt2014-03-041-19/+28
|\ \
| * | Harden NsdManager against null-dereference crashesDave Platt2014-03-041-19/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Avoid duplication of AppWindowToken in created Task"Craig Mautner2014-03-041-1/+2
|\ \
| * | Avoid duplication of AppWindowToken in created TaskYevgen Pronenko2014-03-041-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add casual/cursive/sans-serif-smallcaps font families."Victoria Lease2014-03-031-1/+28
|\ \
| * | Add casual/cursive/sans-serif-smallcaps font families.Victoria Lease2014-03-031-1/+28
| | | | | | | | | | | | | | | Bug: 12384866 Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
* | | Merge "Fix null check for BaseObj.equals."Tim Murray2014-03-031-0/+4
|\ \ \
| * | | Fix null check for BaseObj.equals.Tim Murray2014-02-281-0/+4
| | | | | | | | | | | | | | | | Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
* | | | Merge "Fix indirect misuse of $(my-dir)."Ying Wang2014-03-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix indirect misuse of $(my-dir).Ying Wang2014-02-281-1/+1
|/ / / | | | | | | | | | Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
* | | Merge "Fix descriptor leak after accepting connections"Nick Kralevich2014-02-281-1/+1
|\ \ \
| * | | Fix descriptor leak after accepting connectionsDave Platt2014-02-281-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-282-6/+7
|\ \ \
| * | | Various format string fixes for 64bitKévin PETIT2014-02-242-6/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I74532a4e0400033f5ee3e3f6827ac42f77d16f53 Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
|\ \ \ \
| * | | | AArch64: Use long[] for RS id arrayAshok Bhat2014-02-1210-151/+215
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
|\ \ \ \ \
| * | | | | Update layoutlib method for SystemClockDeepanshu Gupta2014-02-241-5/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update layoutlib to reflect changes from http://android-review.googlesource.com/83061/ Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
* | | | | Merge "Fixed upgrading from forward-lock application to system application"Christopher Tate2014-02-271-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed upgrading from forward-lock application to system applicationBrice Jaglin2014-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the case when the app on system is newer than the currently installed. Something that can happen e.g. after a FOTA update. Change-Id: I102e9cdd5693d5e66667c0c8989dc2643c72dd16
* | | | | Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"Narayan Kamath2014-02-272-3/+2
|\ \ \ \ \
| * | | | | AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAYAshok Bhat2014-02-262-3/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-02-271-1/+1
|\ \ \ \ \
| * | | | | Make getAssetInt throw unconditionally.Narayan Kamath2014-02-251-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | All callers have been moved over to getNativeAsset, and this method has been hidden from the public API internally. Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
* | | | | Merge "Fix AOSP build - DO NOT MERGE"Chris Craik2014-02-261-1/+1
|\ \ \ \ \
| * | | | | Fix AOSP build - DO NOT MERGEChris Craik2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
* | | | | | Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fix graphics corruption caused by HWUI cachesSangkyu Lee2014-02-264-15/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-02-257-30/+30
|\ \ \ \
| * | | | Use reinterpret_cast when an integer is cast to a pointerAshok Bhat2014-02-247-30/+30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-02-258-45/+114
|\ \ \ \ | |/ / / |/| | |
| * | | Use long for pointers in opengl/EGL classesAshok Bhat2014-02-248-45/+114
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge changes I6d4fdada,Ia34899a4Greg Hackmann2014-02-215-116/+119
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
| * | | open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatalGreg Hackmann2014-02-211-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Move time setting code from SystemClock to AlarmManagerServiceGreg Hackmann2014-02-215-116/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "Fix documentation for Parcel.readException()."Elliott Hughes2014-02-211-4/+5
|\ \ \ \
| * | | | Fix documentation for Parcel.readException().Mark Doliner2014-01-021-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old documentation was kind of useless and not clear, so this is an improvement. In addition to this change, I think this method should probably be private instead of public, especially since the values for code are private. But it's too late to change that now. Also the method name is pretty poor, since it's not actually reading anything. Something like "throwException" would be more appropriate. I'm open to suggestions on how to improve this situation. Maybe mark the method as deprecated with a comment that it will be made private in the future? Change-Id: I830f2bcf606714bd130d8c953aa33974b33c9a83
* | | | | Merge "Miscellaneous small documentation fixes."Elliott Hughes2014-02-216-6/+6
|\ \ \ \ \
| * | | | | Miscellaneous small documentation fixes.Mark Doliner2014-01-036-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Most of these I noticed on my own. The change to docs/html/tools/testing/testing_ui.jd is mentioned in a bug report: https://code.google.com/p/android/issues/detail?id=56324 Signed-off-by: Mark Doliner <markdoliner@google.com>
* | | | | Merge "Remove unused JNITest class"Narayan Kamath2014-02-214-170/+0
|\ \ \ \ \
| * | | | | Remove unused JNITest classAshok Bhat2014-02-214-170/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes for 64bit in libhwuiKévin PETIT2014-02-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.1 at 2025-03-27 16:12:32 +0000