OSDN Git Service
Narayan Kamath [Tue, 11 Feb 2014 14:29:09 +0000 (14:29 +0000)]
Merge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 14:07:16 +0000 (14:07 +0000)]
Merge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 13:40:37 +0000 (13:40 +0000)]
Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
Tim Murray [Mon, 10 Feb 2014 23:27:05 +0000 (23:27 +0000)]
Merge "Generic object based data copy."
Jason Sams [Tue, 26 Nov 2013 02:28:33 +0000 (18:28 -0800)]
Generic object based data copy.
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present. This adds support for long/double and reduces
the amount of code present. We could also support arrays of vectors
or objects in the future with this mechanism.
Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
Colin Cross [Mon, 10 Feb 2014 22:02:50 +0000 (22:02 +0000)]
Merge "frameworks/base: fix errors inside ALOGV"
Narayan Kamath [Mon, 10 Feb 2014 13:33:26 +0000 (13:33 +0000)]
Merge "AArch64: Use long for pointers in RS Java/JNI code"
Colin Cross [Fri, 7 Feb 2014 04:17:48 +0000 (20:17 -0800)]
frameworks/base: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
Christopher Tate [Fri, 7 Feb 2014 23:30:23 +0000 (23:30 +0000)]
Merge "Use canonical path for /vendor/app"
John Spurlock [Fri, 7 Feb 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Example controller app for system ui demo mode."
John Spurlock [Fri, 7 Feb 2014 19:47:47 +0000 (14:47 -0500)]
Example controller app for system ui demo mode.
Demo mode is protected behind a system setting. To enable:
$ adb shell settings put global sysui_demo_allowed 1
Change-Id: I2248e27a253bf9eac176e8be9153a2b147cefa40
Ashok Bhat [Fri, 7 Feb 2014 16:31:41 +0000 (16:31 +0000)]
Fix TinyHashMap to use generic hash_type instead of hash_t
TinyHashMap used hash_t(key) to generate hashcode. This
would not work for 64-bit pointers as hash_t is declared as
an uint32_t.
Replaced the hash_t(key) call to more generic android::hash_type(key).
This function is a template function declared in TypeHelpers.h and
has a version available for all data types including pointers.
Change-Id: I612cf18b49ca7c30b63f9d6938df68fed7d80d08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:08:36 +0000 (19:08 +0000)]
Merge "Fix a typo."
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:04:26 +0000 (11:04 -0800)]
Fix a typo.
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
Ashok Bhat [Fri, 7 Feb 2014 12:26:17 +0000 (12:26 +0000)]
Use long to store pointers in ConsumerIrService
Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Dan Sandler [Fri, 7 Feb 2014 15:59:08 +0000 (15:59 +0000)]
Merge "Make sure to turn off led after pulse()"
Chris Craik [Wed, 5 Feb 2014 21:36:42 +0000 (21:36 +0000)]
Merge "Fix for positioning of glyphs within a bitmap"
Ashok Bhat [Tue, 4 Feb 2014 14:57:58 +0000 (14:57 +0000)]
AArch64: Use long for pointers in RS Java/JNI code
Changes include
[x] Some JNI functions, with return type jlong, casts
pointer to jint before returning it. This has been fixed.
[x] Minor JNI function prototype changes where
formal paramter type has been changed to a JNI
type (int to jint for example).
[x] long is used for ScriptC, Sampler, Font, ProgramStore
handles as they can be 64-bit.
[x] A new hidden constructor ScriptC(long, RenderScript)
has been added. This should eventually replace public
API method ScriptC(int, RenderScript).
[x] Font and FileA3D use getNativeAsset instead of getAssetInt
to get Asset Handles. The getAssetInt method will be
deprecated in favor of getNativeAsset, as the former does
not support 64-bit.
[x] rsnPathCreate method accepts loop as an int. This should
be long as the underlying RS function assumes this to be
a pointer.
Change-Id: I919d857e5933febe63966049da83de9f9adee6f5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Stephen Hines [Wed, 5 Feb 2014 01:52:31 +0000 (01:52 +0000)]
Merge "Add message to RS docs about application vs. library packaging."
Tim Murray [Mon, 3 Feb 2014 22:37:12 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
Tim Murray [Mon, 3 Feb 2014 22:37:11 +0000 (22:37 +0000)]
Merge "Check that bound allocations are 1D"
Tim Murray [Mon, 3 Feb 2014 22:37:06 +0000 (22:37 +0000)]
Merge "Fix debug context."
Tim Murray [Mon, 3 Feb 2014 22:37:00 +0000 (22:37 +0000)]
Merge "Enable asynchronous destruction of BaseObjs."
Tim Murray [Mon, 3 Feb 2014 22:36:54 +0000 (22:36 +0000)]
Merge "Fix most logging macros for context pointers."
Tim Murray [Mon, 3 Feb 2014 22:36:53 +0000 (22:36 +0000)]
Merge "Fix getBytesSize for YUV allocations."
Tim Murray [Mon, 3 Feb 2014 22:36:50 +0000 (22:36 +0000)]
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
Tim Murray [Mon, 3 Feb 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Convert Java/JNI to 64-bit, part 2."
Tim Murray [Mon, 3 Feb 2014 22:36:37 +0000 (22:36 +0000)]
Merge changes If93a5d78,I1957f7ac
* changes:
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:36:36 +0000 (22:36 +0000)]
Merge "Use Object + type in place of specific array"
Tim Murray [Mon, 3 Feb 2014 22:36:13 +0000 (22:36 +0000)]
Merge "Utility API for creating types."
Tim Murray [Mon, 3 Feb 2014 22:36:05 +0000 (22:36 +0000)]
Merge "Remove old hidden API."
Tim Murray [Mon, 3 Feb 2014 22:35:14 +0000 (22:35 +0000)]
Merge "Remove hidden API setSurfaceTexture."
Kenny Root [Fri, 31 Jan 2014 22:54:44 +0000 (22:54 +0000)]
Merge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:10:01 +0000 (14:10 -0800)]
Remove DRLCertFactory
No longer needed since Conscrypt is the main provider.
Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
Tim Murray [Fri, 31 Jan 2014 20:57:20 +0000 (12:57 -0800)]
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
Jason Sams [Wed, 15 Jan 2014 00:18:14 +0000 (16:18 -0800)]
Check that bound allocations are 1D
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.
Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
Tim Murray [Fri, 10 Jan 2014 19:25:52 +0000 (11:25 -0800)]
Fix debug context.
bug
12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
Tim Murray [Tue, 7 Jan 2014 19:13:56 +0000 (11:13 -0800)]
Enable asynchronous destruction of BaseObjs.
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
Conflicts:
rs/java/android/renderscript/BaseObj.java
Tim Murray [Tue, 7 Jan 2014 23:36:19 +0000 (15:36 -0800)]
Fix most logging macros for context pointers.
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
Tim Murray [Wed, 18 Dec 2013 01:15:25 +0000 (17:15 -0800)]
Fix getBytesSize for YUV allocations.
bug
12134914
Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
Tim Murray [Tue, 17 Dec 2013 21:28:17 +0000 (13:28 -0800)]
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
Tim Murray [Tue, 19 Nov 2013 20:45:54 +0000 (12:45 -0800)]
Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats:
1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.
bug
11332320
Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
Tim Murray [Fri, 15 Nov 2013 21:08:30 +0000 (13:08 -0800)]
Convert Java/JNI to 64-bit, part 1.
This converts context and device storage to use long instead of int.
bug
11332320
Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
Jason Sams [Wed, 6 Nov 2013 23:08:07 +0000 (15:08 -0800)]
Add long/double read support.
Change-Id: I1957f7ac18262a3004a4adcb7c31055212e483c2
Jason Sams [Wed, 6 Nov 2013 19:22:02 +0000 (11:22 -0800)]
Use Object + type in place of specific array
Changed to avoid the explosion of entry points in the JNI layer.
Change-Id: I7d6cc565c8853b06560eb891fdd5e8acf05c9779
Jason Sams [Thu, 10 Oct 2013 00:15:36 +0000 (17:15 -0700)]
Utility API for creating types.
Change-Id: I3263cb4440ef3a60cd418f0559b8c5638a9b8bf3
Jason Sams [Thu, 26 Sep 2013 19:13:20 +0000 (12:13 -0700)]
Remove old hidden API.
This was never shipped and long since replaced by ioReceive().
Change-Id: Ieba7fd4305c2c561cc36154c57414783e4bf502b
Jason Sams [Tue, 24 Sep 2013 22:18:52 +0000 (15:18 -0700)]
Remove hidden API setSurfaceTexture.
Change-Id: Ib6a3c5b84550932168f314375e74059507fc01ae
Narayan Kamath [Fri, 31 Jan 2014 14:35:13 +0000 (14:35 +0000)]
Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
Ashok Bhat [Fri, 17 Jan 2014 16:02:38 +0000 (16:02 +0000)]
AArch64: Make AssetManager and related classes 64-bit compatible
Following changes have been done:
[x] Long is used to store native pointers as pointers can be
64-bit.
[x] AssetManager openAsset native function returned -1 if
file name was empty and java function considered any
non-zero value as success. This has been fixed by native
function throwing Illegal Argument Exception as well.
[x] AssetManager incRefsLocked and decRefsLocked now accept
long as input to support 64-bit native references.
[x] AssetManager incRefsLocked method incorrecly used
'this.hashCode()' instead of the passed parameter id.
This has been fixed.
[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: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Fri, 31 Jan 2014 14:13:47 +0000 (14:13 +0000)]
Merge "Change ResourceType cookies to int32_t."
Narayan Kamath [Mon, 27 Jan 2014 17:32:37 +0000 (17:32 +0000)]
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
(cherry picked from commit
00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)
Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
Narayan Kamath [Fri, 31 Jan 2014 13:20:58 +0000 (13:20 +0000)]
Merge "Fixed cancel() not working correctly"
Ashok Bhat [Thu, 23 Jan 2014 15:29:55 +0000 (15:29 +0000)]
Use long for pointers in EmojiFactory and PdfDocument
Change-Id: I275c9ce390dd9e01f772e2044c74cebdb0701de6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Stephen Hines [Fri, 31 Jan 2014 03:43:20 +0000 (19:43 -0800)]
Add message to RS docs about application vs. library packaging.
Change-Id: I49b694629ded066e5ee9c1af29970c59cb637fdd
Igor Murashkin [Fri, 31 Jan 2014 01:26:14 +0000 (01:26 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
Zhijun He [Thu, 30 Jan 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Release locked buffer when it fails to acquire graphics buffer"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:57 +0000 (21:50 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
jl1990 [Wed, 7 Aug 2013 15:39:22 +0000 (17:39 +0200)]
Fixed cancel() not working correctly
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)
bug: https://code.google.com/p/android/issues/detail?id=58668
Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
Narayan Kamath [Thu, 30 Jan 2014 10:37:12 +0000 (10:37 +0000)]
Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
Narayan Kamath [Thu, 30 Jan 2014 10:31:43 +0000 (10:31 +0000)]
Merge "change Surface constructor arg to 64bit"
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
(cherry picked from commit
af608e81d450b962a443a21fb1a6feadeb355fe1)
Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
Narayan Kamath [Thu, 30 Jan 2014 09:13:17 +0000 (09:13 +0000)]
Merge "Fix a few more delegate methods in layoutlib."
Johan Redestig [Thu, 30 Jan 2014 08:39:00 +0000 (09:39 +0100)]
Use canonical path for /vendor/app
It wasn't possible to start apps installed in /vendor/app
on a device where /vendor was a symbolic link to /system/vendor.
This is currently the default configuration for android (see
init.rc)
During installation a dex file is created at:
/data/dalvik-cache/vendor@app@blah.blah.apk@classes.dex
But dalvik would fail to start this app with the following error:
I/dalvikvm( 3453): Unable to open or create cache for /system/vendor/app/blah.apk \
(/data/dalvik-cache/system@vendor@app@blah.blah.apk@classes.dex)
Note that dalvik were trying to start /system/vendor/app while the
app was installed in /vendor. There was a conflict between the
package manager and dalvik on how to interpret paths. This change
makes the package manager consistent with dalvik.
Change-Id: I1c7e3c3ae45f97dd742cbf06f7965a7405c821a7
Nick Kralevich [Wed, 29 Jan 2014 18:00:36 +0000 (18:00 +0000)]
Merge "Map SELinux log levels to Android log levels."
Stephen Smalley [Wed, 29 Jan 2014 17:55:58 +0000 (12:55 -0500)]
Map SELinux log levels to Android log levels.
Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
John Spurlock [Wed, 29 Jan 2014 15:36:40 +0000 (15:36 +0000)]
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
Narayan Kamath [Wed, 29 Jan 2014 15:05:03 +0000 (15:05 +0000)]
Fix a few more delegate methods in layoutlib.
Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 12:21:32 +0000 (12:21 +0000)]
mNativeCanvas is long, not int.
swapNativeCanvas was asking for an int field.
Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
Narayan Kamath [Wed, 29 Jan 2014 12:12:27 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:12:17 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:00:27 +0000 (12:00 +0000)]
Merge "AArch64: Use long for pointers in DRM classes"
Ashok Bhat [Fri, 17 Jan 2014 16:44:27 +0000 (16:44 +0000)]
AArch64: Use of long for pointers in PropertyValuesHolder
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.
Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Wed, 29 Jan 2014 10:43:22 +0000 (10:43 +0000)]
Merge "AArch64: Make Binder and Parcel 64-bit compatible"
fisherson_lin [Mon, 20 Jan 2014 06:47:27 +0000 (14:47 +0800)]
[Navigation bar] Allow "right to left" gesture to launch search panel
Symptom: "Bottom to up" gesture can launch search panel in portrait, but "right to left" gesture CANNOT in landscape.
Root Cause: Not handled.
Solution: Set swapXY to handle this in landscape case.
Change-Id: I1793280b3656af6912e6b4583b08e80a0a38e44a
Mark Salyzyn [Tue, 28 Jan 2014 21:30:39 +0000 (21:30 +0000)]
Merge changes I3659193f,I8b78e4db
* changes:
jni: Resolve build warnings
jni: Incorporate liblog reading API
Narayan Kamath [Tue, 28 Jan 2014 19:12:33 +0000 (19:12 +0000)]
Merge "Track 64bit changes to android/graphics."
Narayan Kamath [Tue, 28 Jan 2014 19:12:29 +0000 (19:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Camera"
Narayan Kamath [Tue, 28 Jan 2014 19:12:16 +0000 (19:12 +0000)]
Merge "AArch64: Make graphics classes 64-bit compatible"
Craig Mautner [Tue, 28 Jan 2014 18:05:30 +0000 (18:05 +0000)]
Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"
Narayan Kamath [Mon, 27 Jan 2014 14:24:16 +0000 (14:24 +0000)]
Track 64bit changes to android/graphics.
All pointers are now 64bits wide, so should be
represented as java longs and not ints.
Also changed DelegateManager and SparseWeakArray to
reflect the new world order.
(cherry picked from commit
88a8364c386c694f7ad56662ef89713dbf7c9d63)
Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
Ashok Bhat [Mon, 13 Jan 2014 20:44:05 +0000 (20:44 +0000)]
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, 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: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Mon, 20 Jan 2014 20:08:01 +0000 (20:08 +0000)]
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers 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)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
louis_chang [Tue, 28 Jan 2014 10:38:06 +0000 (18:38 +0800)]
[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
Symptom:
When press Home key to home screen, user is able to see the activity's window shown on top of wallpaper and below launcher(widgets).
Root Cause:
The ensureActivitiesVisibleLocked() is called pretty often (for example when a new process bound).
If the top activity "B" was finishing, then the previous activity "A" should be visible.
Therefore, the activity "A" window will be set to visible and then launched activity "A", but it does not updates the visible state in ActivityRecord for "A".
There has a timing issue that if a new activity "C" is started, "C" becomes the new top activity and be resumed.
In that case, Activity "A" window will remain visible even if it is behind a full screen activity "C" because the ActivityRecord.visble of "A" is still false, so the window visibility won't be update.
So when user press home key and back to launcher, the surface of activity "A" will be composed on top of wallpaper.
Solution:
Updates ActivityRecord.visible to true for "A". After "C" is started, the "A" will be called WindowManagerService.setAppVisibility() to set invisible, then called onStop() when execute ensureActivitiesVisibleLocked() again.
Change-Id: I536ba04b95d8d274fea6d679a6493e620bc981e2
lina.x.pi [Mon, 27 Jan 2014 02:31:44 +0000 (10:31 +0800)]
Release locked buffer when it fails to acquire graphics buffer
The JNI buffer in ImageReader_imageSetup is not released when
it fails to acquire graphics buffer. After all JNI buffers are
exhausted, ACQUIRE_MAX_IMAGES will be returned and leads to
error. The JNI buffer should be released when it fails to acquire
graphics buffer.
Change-Id: I3319a58ac44e36c8593b404672a685c4b589a735
Mark Salyzyn [Thu, 7 Nov 2013 19:16:22 +0000 (11:16 -0800)]
jni: Resolve build warnings
(cherry picked from commit
087f58dd80e3296a53c6e3c74c089e9a0265f3bd)
Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
Mark Salyzyn [Thu, 5 Dec 2013 18:06:18 +0000 (10:06 -0800)]
jni: Incorporate liblog reading API
(cherry picked from commit
e11cbd441df4a1689c89b2ab91b84523c9f2fd10)
Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
Christopher Tate [Mon, 27 Jan 2014 19:29:56 +0000 (19:29 +0000)]
Merge "Fixed race condition in Spinner.DialogPopup on null reference."
Mathieu Chartier [Mon, 27 Jan 2014 17:26:47 +0000 (17:26 +0000)]
Merge "Fix dest == src bugs in Matrix.cpp."
Narayan Kamath [Mon, 27 Jan 2014 11:56:03 +0000 (11:56 +0000)]
Merge "AssetManager cookies should be int32_t and not void*."
Narayan Kamath [Mon, 27 Jan 2014 11:17:22 +0000 (11:17 +0000)]
AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.
(cherry picked from commit
ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit
a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit
a9d5701b034ed2d9771b3f0943e1add00741d7cd)
Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
Mathieu Chartier [Sun, 26 Jan 2014 01:54:22 +0000 (17:54 -0800)]
Fix dest == src bugs in Matrix.cpp.
The main bug was that the AutoJavaFloatArray autoSrc was not passing in
read only. This meant that the destructor overwrote the data which
the autoDst AutoJavaFloatArray had written in it's destructor.
This case only happened if src == dest and the arrays were copies.
Also improved performance by passing in read only a few other places.
Bug:
12570144
Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
Wink Saville [Sat, 25 Jan 2014 21:51:34 +0000 (21:51 +0000)]
Merge "Telephony: Modify code to check that PUK code length is always 8."
Oskar Andero [Tue, 3 Dec 2013 16:41:27 +0000 (17:41 +0100)]
Make sure to turn off led after pulse()
setLightLocked() will update mColor. This will cause the led to not be
turned off after the pulse.
When notificationManager starts a attention pulse the led will be kept
on. Since attention is of highest prio nothing can turn it off.
This is fixed by resetting mColor back to 0 after the call.
Change-Id: Id60ef96e5c21b47c23002f0bcf2fae7fb3f2ca10
Narayan Kamath [Fri, 24 Jan 2014 09:27:48 +0000 (09:27 +0000)]
Merge "Remove unused field from AssetManager."
Selim Gurun [Thu, 23 Jan 2014 22:26:33 +0000 (22:26 +0000)]
Merge "Revert "Adding freeMemoryForTests static method to WebView.""
Selim Gurun [Thu, 23 Jan 2014 22:13:40 +0000 (22:13 +0000)]
Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit
c6a2a6e20f7ddd5a903e9395f6c574c316960694.
Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
Selim Gurun [Thu, 23 Jan 2014 19:42:18 +0000 (19:42 +0000)]
Merge "Adding freeMemoryForTests static method to WebView."