OSDN Git Service
Elliott Hughes [Sat, 18 Jan 2014 02:27:27 +0000 (18:27 -0800)]
Don't confuse stat and stat64.
Bug:
11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
Chris Craik [Fri, 17 Jan 2014 18:41:14 +0000 (18:41 +0000)]
Merge "Initialize pointer members to NULL to avoid illegal reference"
Narayan Kamath [Fri, 17 Jan 2014 10:25:27 +0000 (10:25 +0000)]
Merge "Fix error checking in MemoryFile."
lina.x.pi [Thu, 9 Jan 2014 10:17:03 +0000 (18:17 +0800)]
Initialize pointer members to NULL to avoid illegal reference
mBitmap and mTexture is not initialized to NULL which causes
illegal address access when it fails to be created from
oversized bitmap.
Change-Id: Iea54bec8788bc5f3a10040fdb43f416c0d41a14c
Narayan Kamath [Thu, 16 Jan 2014 13:17:03 +0000 (13:17 +0000)]
Fix error checking in MemoryFile.
mmap returns MAP_FAILED on failures, not 0 (NULL).
Also, convert some C style casts to C++ since they
make intent clearer.
Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d
Narayan Kamath [Thu, 16 Jan 2014 12:12:15 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in view/input classes"
Narayan Kamath [Thu, 16 Jan 2014 12:11:39 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MessageQueue"
Narayan Kamath [Thu, 16 Jan 2014 12:12:11 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/PathMeasure"
Narayan Kamath [Thu, 16 Jan 2014 12:12:00 +0000 (12:12 +0000)]
Merge "Make YuvToJpegEncoder more JNI compliant"
Narayan Kamath [Thu, 16 Jan 2014 12:11:58 +0000 (12:11 +0000)]
Merge changes Id54087dd,I946325e4,I2a2b2e68
* changes:
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in media classes"
Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]
Merge "AArch64: Use long for pointers in speech/srec classes"
Ashok Bhat [Mon, 6 Jan 2014 11:35:32 +0000 (11:35 +0000)]
AArch64: Use long for pointers in speech/srec classes
For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.
Note corresponding JNI files are in the external/srec project
under srec_jni directory.
Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Fixed mistaken reference to "LTE". Bug
7637224"
Jeff Hao [Wed, 15 Jan 2014 19:34:39 +0000 (19:34 +0000)]
Merge "Add sample profiling interface to startMethodTracing."
Jeff Hao [Mon, 6 Jan 2014 23:52:52 +0000 (15:52 -0800)]
Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.
Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
Marco Nelissen [Wed, 15 Jan 2014 17:17:05 +0000 (17:17 +0000)]
Merge "Before requerying a cursor, check if it is closed."
Ashok Bhat [Wed, 8 Jan 2014 14:32:49 +0000 (14:32 +0000)]
AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
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)
In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.
Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Wed, 8 Jan 2014 16:47:08 +0000 (16:47 +0000)]
AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie 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: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Tue, 14 Jan 2014 10:52:35 +0000 (10:52 +0000)]
AArch64: Add AssetInputStream.getNativeAsset
This patch adds AssetInputStream.getNativeAsset. This function
returns asset pointer, which can then be passed to JNI functions.
Note that this function is hidden and not part of Android API.
This function will eventually replace getAssetInt,
once all the classes that use getAssetInt are changed
to use getNativeAsset instead.
Change-Id: I2a2b2e6864f1f57ae2b3a10c45559b3635266ed5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Mon, 6 Jan 2014 13:45:09 +0000 (13:45 +0000)]
AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
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: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]
Merge "Add NULL check in updateProxyConfig"
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
(cherry picked from commit
f8f09a15a409f373f22aa475bb0defd264088e4f)
Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
Jeff Sharkey [Mon, 13 Jan 2014 18:35:31 +0000 (18:35 +0000)]
Merge "MountService listeners can not be unregistered"
Ashok Bhat [Fri, 10 Jan 2014 16:24:38 +0000 (16:24 +0000)]
Make YuvToJpegEncoder more JNI compliant
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: I4015138921cc18ecae52daaa6710b3c9efd68e87
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Fri, 10 Jan 2014 18:38:39 +0000 (18:38 +0000)]
AArch64: Use long for pointers in graphics/PathMeasure
For storing pointers, long is used in
android/graphics/PathMeasure 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: I4599a9d5f7dcf9c39838db96d9033059114d3a49
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Narayan Kamath [Mon, 13 Jan 2014 12:29:41 +0000 (12:29 +0000)]
Merge "Fix preference puts with "null" values."
Jason Sams [Sat, 11 Jan 2014 00:42:19 +0000 (00:42 +0000)]
Merge "Fix a JNI local reference leak in MediaDrm"
Craig Mautner [Fri, 10 Jan 2014 23:55:43 +0000 (23:55 +0000)]
Merge "Fix visibility of multiple non-fullscreen activities."
Ashok Bhat [Fri, 10 Jan 2014 14:15:21 +0000 (14:15 +0000)]
AArch64: Use long for pointers in android/os/MessageQueue
Long is used in android/os/MessageQueue class to store
pointers 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: I7e901b8515a5b5e3afe1dadaaf3e5c186955c2a0
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Ashok Bhat [Fri, 10 Jan 2014 13:40:47 +0000 (13:40 +0000)]
AArch64: Use long for pointers in android/os/MemoryFile
Long is used in android/os/MemoryFile class to store
pointers 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: I07afc010524c16b5c852273b89becb0c08ff27d7
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Christopher Tate [Thu, 9 Jan 2014 20:41:26 +0000 (20:41 +0000)]
Merge "Cursor leakage due to cancellation signal"
Ashok Bhat [Wed, 8 Jan 2014 14:04:51 +0000 (14:04 +0000)]
AArch64: Use long for pointers in view/input classes
For storing pointers, long is used in view/input classes,
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: Iafda9f4653c023bcba95b873637d935d0b569f5d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
riddle_hsu [Thu, 9 Jan 2014 12:24:34 +0000 (20:24 +0800)]
Fix visibility of multiple non-fullscreen activities.
Issue detail:
Assume X, Y are non-fullscreen activities.
a.Home starts an activity X in task A in application stack.
b.X starts an activity Y in <task A> or <new task B>
c.Activity X will be invisible.
How to fix:
Because the function "isActivityOverHome" means an activity is able to see home.
But there may have many non-fullscreen activities between the top non-fullscreen activity and home.
If flag "behindFullscreen" is set, those middle activities will be invisible.
So it should only take care from who is adjacent to home.
Then check two flags frontOfTask(task root) and mOnTopOfHome for constraining the condition.
Change-Id: I60bcea304976414e44835a0a38675aae365e9e19
David Friedman [Thu, 9 Jan 2014 05:34:02 +0000 (21:34 -0800)]
Fixed mistaken reference to "LTE".
Bug
7637224
Change-Id: I9c78fe6edd1182f8132cc5db9ecedbb69681b473
Wink Saville [Wed, 8 Jan 2014 19:25:11 +0000 (19:25 +0000)]
Merge "telephony: Add same named operator configuration for some operators"
Ashok Bhat [Wed, 8 Jan 2014 15:45:39 +0000 (15:45 +0000)]
AArch64: Use long for pointers in VelocityTracker class
For storing pointers, long is used in VelocityTracker class,
as native pointers can be 64-bit.
Change-Id: I8c454663a97745c7440bb6f99ef49d28e9026876
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Wed, 8 Jan 2014 14:45:08 +0000 (14:45 +0000)]
AArch64: Use long for pointers in MotionEvent class
For storing pointers, long is used in MotionEvent class,
as native pointers can be 64-bit.
Change-Id: I88ebfef26070b7f49c14945cad37aa3db209ec90
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>
Ashok Bhat [Wed, 8 Jan 2014 14:15:02 +0000 (14:15 +0000)]
AArch64: Use long for pointers in KeyCharacterMap class
For storing pointers, long is used in KeyCharacterMap class,
as native pointers can be 64-bit.
Change-Id: Idc1b39874202e96b9231d7801e6707003787659b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Mike Lockwood [Wed, 8 Jan 2014 15:56:13 +0000 (15:56 +0000)]
Merge "Added missing USB device descriptor fields needed for intent filters"
Narayan Kamath [Wed, 8 Jan 2014 12:47:31 +0000 (12:47 +0000)]
Merge "Fix a bug introduced in change 73712"
Narayan Kamath [Wed, 8 Jan 2014 12:26:28 +0000 (12:26 +0000)]
Fix a bug introduced in change 73712
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"
Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
Narayan Kamath [Wed, 8 Jan 2014 11:58:32 +0000 (11:58 +0000)]
Fix preference puts with "null" values.
Null values were being written out as <null /> elements in the
XML prefs file (as expected). This allowed the getFoo() functions
to work correctly because they treated null values as missing mappings
but containsKey would fail.
bug: https://code.google.com/p/android/issues/detail?id=64563
Change-Id: I1f466d01db96bf26e208d4fed3a6f257228bea5d
Narayan Kamath [Wed, 8 Jan 2014 11:54:29 +0000 (11:54 +0000)]
Merge "AArch64: Use long for pointers in App/Backup"
Ashok Bhat [Thu, 2 Jan 2014 16:52:41 +0000 (16:52 +0000)]
AArch64: Use long for pointers in App/Backup
For storing pointers, long is used, 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: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Wed, 8 Jan 2014 11:53:50 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers"
Ashok Bhat [Thu, 2 Jan 2014 13:42:56 +0000 (13:42 +0000)]
AArch64: Use long for pointers
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.
Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Wed, 8 Jan 2014 11:53:11 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in hardware classes"
Narayan Kamath [Wed, 8 Jan 2014 11:53:00 +0000 (11:53 +0000)]
Merge "AArch64: Use long for pointers in services"
Ashok Bhat [Fri, 3 Jan 2014 14:37:19 +0000 (14:37 +0000)]
AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware classes,
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: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Ashok Bhat [Thu, 2 Jan 2014 19:43:30 +0000 (19:43 +0000)]
AArch64: Use long for pointers in services
For storing pointers, long is used, 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: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Robert Greenwalt [Wed, 8 Jan 2014 00:38:29 +0000 (00:38 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
Ian Rogers [Tue, 7 Jan 2014 21:31:17 +0000 (21:31 +0000)]
Merge "Add a call to registerAppInfo for the VMRuntime"
Narayan Kamath [Tue, 7 Jan 2014 12:54:11 +0000 (12:54 +0000)]
Merge "AArch64: Use long for pointers in MTP classes"
Ashok Bhat [Tue, 17 Dec 2013 19:04:19 +0000 (19:04 +0000)]
AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
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: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:50:07 +0000 (12:50 +0000)]
Merge "AArch64: Use long for pointers in VideoEditor classes"
Ashok Bhat [Tue, 17 Dec 2013 14:13:08 +0000 (14:13 +0000)]
AArch64: Use long for pointers in VideoEditor classes
For storing pointers, long is used in VideoEditor
classes, 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: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:49:27 +0000 (12:49 +0000)]
Merge "AArch64: Use long for pointers in DisplayEventReceiver"
Ashok Bhat [Wed, 18 Dec 2013 18:00:05 +0000 (18:00 +0000)]
AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used 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: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"
Ashok Bhat [Tue, 17 Dec 2013 12:42:00 +0000 (12:42 +0000)]
AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, 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: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"
Ashok Bhat [Tue, 17 Dec 2013 14:10:25 +0000 (14:10 +0000)]
AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.
Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."
Conley Owens [Mon, 6 Jan 2014 23:36:02 +0000 (23:36 +0000)]
Merge "CompoundButton: Let text can be changed by config"
Raph Levien [Mon, 6 Jan 2014 17:00:49 +0000 (17:00 +0000)]
Merge "Re-initialize error after attach"
Narayan Kamath [Mon, 6 Jan 2014 11:31:35 +0000 (11:31 +0000)]
Fix broken XML parsing idiom.
Code that expected a single top level element in an XML file
was doing something like :
while (type != START_TAG) { next(); }
This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.
bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
Narayan Kamath [Wed, 18 Dec 2013 15:19:17 +0000 (15:19 +0000)]
XmlUtils#readThisMapXml should handle null keys.
Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.
Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.
bug: https://code.google.com/p/android/issues/detail?id=63463
Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
Craig Mautner [Thu, 19 Dec 2013 17:48:58 +0000 (17:48 +0000)]
Merge "Keydispatching timeout while finish Activity"
Narayan Kamath [Thu, 19 Dec 2013 12:35:22 +0000 (12:35 +0000)]
Merge "MediaDrm#mNativeContext is a long, not int."
Martin Wallgren [Wed, 31 Aug 2011 10:39:31 +0000 (12:39 +0200)]
Keydispatching timeout while finish Activity
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.
Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
Peter Eliasson [Fri, 28 Jun 2013 11:55:41 +0000 (13:55 +0200)]
Cursor leakage due to cancellation signal
If a query call was cancelled, the cursor adaptor might leak. The
adaptor is now closed if any exception is thrown during query.
Change-Id: Ic4c2edeaf2fcef56b4ef59484a36d3233aa12dbc
Brian Carlstrom [Thu, 19 Dec 2013 07:13:02 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Patrik2 Carlsson [Tue, 10 Dec 2013 13:52:43 +0000 (14:52 +0100)]
Fix a JNI local reference leak in MediaDrm
A reference leak was found in the subtitle usecase that also
applies to android_media_MediaDrm.cpp
(Code taken from the similar fix in android_media_MediaPlayer.cpp)
Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
Brian Carlstrom [Fri, 13 Dec 2013 07:12:55 +0000 (23:12 -0800)]
Track Looper decoupling from ALooper
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
Tim Murray [Thu, 19 Dec 2013 01:42:41 +0000 (01:42 +0000)]
Merge "Handle user-defined cache path for RS."
Tim Murray [Fri, 13 Dec 2013 20:57:36 +0000 (12:57 -0800)]
Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
Dave Allison [Thu, 14 Nov 2013 01:15:50 +0000 (17:15 -0800)]
Add a call to registerAppInfo for the VMRuntime
This calls into the VMRuntime tells it where the
application directory is located.
Bug:
11539952
Change-Id: I20e0b8c63e459699a1bc9af435e65ae96f1e1e73
Oscar Rydhé [Tue, 24 Sep 2013 11:43:55 +0000 (13:43 +0200)]
Add NULL check in updateProxyConfig
If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.
Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
Stephen Hines [Thu, 19 Dec 2013 00:30:25 +0000 (00:30 +0000)]
Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
Stephen Hines [Thu, 19 Dec 2013 00:21:30 +0000 (16:21 -0800)]
DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547
This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.
Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
Narayan Kamath [Wed, 18 Dec 2013 18:08:58 +0000 (18:08 +0000)]
Merge "Remove unused field from MediaMuxer"
Narayan Kamath [Wed, 18 Dec 2013 17:51:06 +0000 (17:51 +0000)]
Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
Narayan Kamath [Wed, 18 Dec 2013 16:53:54 +0000 (16:53 +0000)]
MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.
Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
Narayan Kamath [Wed, 18 Dec 2013 12:46:40 +0000 (12:46 +0000)]
Merge "Don't pseudolocalize untranslatable strings."
Niklas Brunlid [Fri, 5 Jul 2013 06:54:03 +0000 (08:54 +0200)]
MountService listeners can not be unregistered
When unregistering MountService listeners, their Binder proxy
objects were compared to registered listeners instead of their
backing objects.
Change-Id: Ie98a686b1d17544f1eda59fb3eb0dc02d836c1b2
Greg Hackmann [Tue, 17 Dec 2013 18:11:06 +0000 (18:11 +0000)]
Merge "Add /dev/rtc backend to SystemClock"
Greg Hackmann [Tue, 17 Dec 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Add timerfd backend to AlarmManagerService"
Greg Hackmann [Tue, 17 Dec 2013 18:10:32 +0000 (18:10 +0000)]
Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.
TaskRecord task may be set to null when no resumed activity remain.
Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.
The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.
Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.
To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.
Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.
Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
Greg Hackmann [Thu, 12 Dec 2013 02:00:34 +0000 (18:00 -0800)]
Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).
Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>