OSDN Git Service
Narayan Kamath [Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)]
am
d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
* commit '
d5970e9ca34038051f694c7349fa5f3548ee9499':
AssetManager cookies should be int32_t and not void*.
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
Wink Saville [Sun, 26 Jan 2014 16:43:28 +0000 (08:43 -0800)]
am
d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '
d1eeb6747820f549ec724546a84e3860b4580587':
Telephony: Modify code to check that PUK code length is always 8.
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."
Narayan Kamath [Fri, 24 Jan 2014 09:39:47 +0000 (01:39 -0800)]
am
3c30eff6: Merge "Remove unused field from AssetManager."
* commit '
3c30eff63fb33901df4e040ecce78f7755be588f':
Remove unused field from AssetManager.
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:37:15 +0000 (14:37 -0800)]
am
a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '
a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
Revert "Adding freeMemoryForTests static method to WebView."
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:49:00 +0000 (11:49 -0800)]
am
f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView."
* commit '
f6d69ae0f9215e08137b010acb4076a30e3d28c6':
Adding freeMemoryForTests static method to WebView.
Selim Gurun [Thu, 23 Jan 2014 19:42:18 +0000 (19:42 +0000)]
Merge "Adding freeMemoryForTests static method to WebView."
Selim Gurun [Thu, 23 Jan 2014 19:21:00 +0000 (11:21 -0800)]
Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
Bug: b/
10629847
(cherry picked from commit
54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
Christopher Tate [Thu, 23 Jan 2014 01:43:52 +0000 (17:43 -0800)]
am
407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
* commit '
407f74f494e5374d9bdceae9d9fb453aa8270f6b':
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
Christopher Tate [Thu, 23 Jan 2014 01:40:37 +0000 (01:40 +0000)]
Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"
Christopher Tate [Wed, 22 Jan 2014 23:50:31 +0000 (15:50 -0800)]
am
cc81bcec: Merge "Only send storage intents after boot complete"
* commit '
cc81bcece411794b4eac6b03b7700a0214fdbb87':
Only send storage intents after boot complete
Christopher Tate [Wed, 22 Jan 2014 23:46:57 +0000 (23:46 +0000)]
Merge "Only send storage intents after boot complete"
Narayan Kamath [Wed, 22 Jan 2014 11:09:09 +0000 (11:09 +0000)]
Remove unused field from AssetManager.
This field was introduced in commit
4bdd33b81a17 but wasn't
used there (or since).
Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e
Christopher Tate [Wed, 22 Jan 2014 01:45:00 +0000 (17:45 -0800)]
am
9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
* commit '
9fc157a4767f54d1cff53dc9489638b67aec2da3':
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Christopher Tate [Wed, 22 Jan 2014 01:42:50 +0000 (01:42 +0000)]
Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
Naofumi Harada [Tue, 21 Jan 2014 01:29:36 +0000 (10:29 +0900)]
FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.
Bug:
12640283
Change-Id: Ic24b5882f65dabdfae9cc39da3d68661bed4fc31
Johan Redestig [Sat, 18 Jan 2014 21:46:56 +0000 (22:46 +0100)]
Only send storage intents after boot complete
It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.
If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.
Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.
Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0
Elliott Hughes [Sat, 18 Jan 2014 02:36:02 +0000 (18:36 -0800)]
am
c9a60b0f: Merge "Don\'t confuse stat and stat64."
* commit '
c9a60b0f77525244ac4f970258703b8dc62ee140':
Don't confuse stat and stat64.
Elliott Hughes [Sat, 18 Jan 2014 02:32:39 +0000 (02:32 +0000)]
Merge "Don't confuse stat and stat64."
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 19:20:38 +0000 (11:20 -0800)]
am
5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"
* commit '
5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb':
Initialize pointer members to NULL to avoid illegal reference
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 17:36:23 +0000 (09:36 -0800)]
am
53e9bfae: Merge "Fix error checking in MemoryFile."
* commit '
53e9bfaee1064f1858c307409e51aa4566ae4b95':
Fix error checking in MemoryFile.
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 15:32:03 +0000 (07:32 -0800)]
am
486544f7: Merge "AArch64: Use long for pointers in view/input classes"
* commit '
486544f763bd27eb92c95101e23f939c79c9890e':
AArch64: Use long for pointers in view/input classes
Narayan Kamath [Thu, 16 Jan 2014 15:32:01 +0000 (07:32 -0800)]
am
84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"
* commit '
84ee7930bb0f91f6a19662efa4c3f7c7044be426':
AArch64: Use long for pointers in android/os/MessageQueue
Narayan Kamath [Thu, 16 Jan 2014 15:31:58 +0000 (07:31 -0800)]
am
98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '
98002dfb60a20caf62d6682659547c042a4a3342':
AArch64: Use long for pointers in graphics/PathMeasure
Narayan Kamath [Thu, 16 Jan 2014 15:31:56 +0000 (07:31 -0800)]
am
1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"
* commit '
1b0f0be0979cbe00641d5d386691e87d668a2aa8':
Make YuvToJpegEncoder more JNI compliant
Narayan Kamath [Thu, 16 Jan 2014 15:31:53 +0000 (07:31 -0800)]
am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
bb35356dc05632664e1d65588c9d0570c185280b':
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 15:31:50 +0000 (07:31 -0800)]
am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
138d67c8476a846030be74ced1b1990d497402e0':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:31:48 +0000 (07:31 -0800)]
am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
d85bba8ebd24257cb52867b6a082350746e97ad2':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:31:45 +0000 (07:31 -0800)]
am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
27a647bf382f12aea6d0c9584302423e1c44fbb0':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:31:42 +0000 (07:31 -0800)]
am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:31:39 +0000 (07:31 -0800)]
am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:31:36 +0000 (07:31 -0800)]
am
991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '
991e9818c69443fac927970c4c3521adaf687a44':
AArch64: Use long for pointers in speech/srec classes
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:49:14 +0000 (15:49 -0800)]
am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
a6aa3199bdb676e349c28b861a04c34a4ec136e0':
Fixed mistaken reference to "LTE". Bug
7637224
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:38:01 +0000 (11:38 -0800)]
am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
Add sample profiling interface to startMethodTracing.
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:19:52 +0000 (09:19 -0800)]
am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
c3036a12467395465b86e6935af8aa500c1b128d':
Before requerying a cursor, check if it is closed.
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:11:39 +0000 (08:11 -0800)]
am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig
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:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
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:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
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
Oskar Grönqvist [Wed, 11 Dec 2013 13:14:33 +0000 (14:14 +0100)]
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
To be able to customize the "WiFi scan always available"
setting we need to set a default value.
Change-Id: I3673f2613ab9b6a947aed7e29d4cc876140c2180
Jeff Sharkey [Mon, 13 Jan 2014 18:37:51 +0000 (10:37 -0800)]
am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
90cadb35156829ff1d6b7066409596da38fc70e1':
MountService listeners can not be unregistered
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:32:19 +0000 (04:32 -0800)]
am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
Fix preference puts with "null" values.
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:48:12 +0000 (16:48 -0800)]
am
868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit '
868173a53f0d1059408b049f30af3402d5b0de64':
Fix a JNI local reference leak in MediaDrm
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:59:59 +0000 (15:59 -0800)]
am
3747768b: Merge "Fix visibility of multiple non-fullscreen activities."
* commit '
3747768bde14ff9db96279830f07602ec50544cc':
Fix visibility of multiple non-fullscreen activities.
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:43:39 +0000 (12:43 -0800)]
am
35b7de4c: Merge "Cursor leakage due to cancellation signal"
* commit '
35b7de4c4562db8af697ad3384c09d2258d183ba':
Cursor leakage due to cancellation signal
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:28:58 +0000 (11:28 -0800)]
am
76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit '
76d5cdd820b5d81af8de73180c272d7f8a01caae':
telephony: Add same named operator configuration for some operators
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:59:06 +0000 (07:59 -0800)]
am
9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '
9607d78f5144792993bd254a4b5983b2a9d5bf83':
Added missing USB device descriptor fields needed for intent filters
Mike Lockwood [Wed, 8 Jan 2014 15:56:13 +0000 (15:56 +0000)]
Merge "Added missing USB device descriptor fields needed for intent filters"
Rakesh Pallerla [Wed, 8 Jan 2014 10:19:34 +0000 (15:49 +0530)]
Telephony: Modify code to check that PUK code length is always 8.
As per 3GPP TS 31.101 Release 11 section 9.6, the number of digits
for UNBLOCK PIN (PUK) is always 8.
Change-Id: I4ea69fd8e2e8e96330d10a67b2d1f5a1859c1016
Narayan Kamath [Wed, 8 Jan 2014 12:49:24 +0000 (04:49 -0800)]
am
8a927cfa: Merge "Fix a bug introduced in change 73712"
* commit '
8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
Fix a bug introduced in change 73712