Elliott Hughes
31a1dd2a8f
Merge "Use the suggested public API instead of libcore.os."
2014-04-24 23:52:16 +00:00
Elliott Hughes
cacbe1b1ef
Use the suggested public API instead of libcore.os.
...
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
2014-04-24 16:19:27 -07:00
Mark Salyzyn
eacaa353e8
am c717179e: Merge "jni: android_util_Process 64 bit issues"
...
* commit 'c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
2014-04-24 22:14:02 +00:00
Mark Salyzyn
c717179e4f
Merge "jni: android_util_Process 64 bit issues"
2014-04-24 22:10:22 +00:00
Mark Salyzyn
c6a410164e
jni: android_util_Process 64 bit issues
...
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
2014-04-24 13:09:15 -07:00
Nick Kralevich
140dc63f4f
am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
...
* commit '8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
2014-04-24 18:22:20 +00:00
Nick Kralevich
8480384986
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
2014-04-24 18:18:02 +00:00
Daniel Leung
49cbafad9b
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
...
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2014-04-24 19:12:38 +01:00
Elliott Hughes
8d47f23e43
am dbb0de21: Merge "Fix a typo in an assertion."
...
* commit 'dbb0de21d35343504b096ae6cbf97d122ac410c9':
Fix a typo in an assertion.
2014-04-24 00:25:01 +00:00
Elliott Hughes
dbb0de21d3
Merge "Fix a typo in an assertion."
2014-04-23 23:55:33 +00:00
Elliott Hughes
6bd762289b
Fix a typo in an assertion.
...
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
2014-04-23 16:54:33 -07:00
Neil Fuller
caf6497b9a
am 683cf1bf: Merge "Changes to support asynchronous close interruption"
...
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
Changes to support asynchronous close interruption
2014-04-23 16:45:15 +00:00
Neil Fuller
683cf1bffe
Merge "Changes to support asynchronous close interruption"
2014-04-23 16:41:17 +00:00
Neil Fuller
43582df3db
Changes to support asynchronous close interruption
...
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a
Bug: 13927110
Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
2014-04-23 16:40:35 +00:00
Deepanshu Gupta
cf5c3fc70d
am 53b7df19: Merge "Add missing ICU_Delegate methods."
...
* commit '53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
Add missing ICU_Delegate methods.
2014-04-22 23:10:40 +00:00
Deepanshu Gupta
53b7df19cf
Merge "Add missing ICU_Delegate methods."
2014-04-22 23:08:06 +00:00
Nick Kralevich
5246f4599a
am d267c1a0: Merge "remove unneeded import statements."
...
* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
remove unneeded import statements.
2014-04-22 19:52:21 +00:00
Nick Kralevich
3ab7882a57
am a67d4a6e: Merge "remove unused import."
...
* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
remove unused import.
2014-04-22 19:52:18 +00:00
Nick Kralevich
d267c1a06f
Merge "remove unneeded import statements."
2014-04-22 19:24:47 +00:00
Nick Kralevich
a67d4a6e4d
Merge "remove unused import."
2014-04-22 19:23:30 +00:00
Nick Kralevich
c826257bf3
remove unneeded import statements.
...
Internal master is out of sync with AOSP. Resync.
Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
2014-04-22 12:17:51 -07:00
Nick Kralevich
8cb5abcfde
remove unused import.
...
This change resynchronizes AOSP with internal master.
The import line is unused.
Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
2014-04-22 12:10:24 -07:00
Zach Swasey
a33666a7ca
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
...
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property enabled.
Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
2014-04-21 14:54:21 -07:00
Deepanshu Gupta
e2b67777ad
Add missing ICU_Delegate methods.
...
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2
Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
2014-04-21 14:33:33 -07:00
Jesse Hall
650a8860d9
am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
...
* commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
2014-04-21 19:41:29 +00:00
Jesse Hall
fc3c6a0ef3
Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
2014-04-21 19:38:45 +00:00
Ying Wang
9df9ad7e29
am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
...
* commit '2a52862db5257edcafa137276ce3d8dc54cd443e':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
2014-04-21 13:35:26 +00:00
Ying Wang
2a52862db5
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
2014-04-19 00:07:49 +00:00
Ying Wang
38250d9b84
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
...
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
2014-04-18 16:39:47 -07:00
Elliott Hughes
cf4d85e478
am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
...
* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
Fix warning introduced by recent psuedolocalizer change.
2014-04-18 23:20:21 +00:00
Elliott Hughes
90840ec29d
Merge "Fix warning introduced by recent psuedolocalizer change."
2014-04-18 23:16:44 +00:00
Elliott Hughes
0a1eed394f
Fix warning introduced by recent psuedolocalizer change.
...
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
2014-04-18 16:15:27 -07:00
Elliott Hughes
ec42199a71
am 92b2d5a6: Merge "Pseudolocalizer improvements."
...
* commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
Pseudolocalizer improvements.
2014-04-18 22:36:32 +00:00
Elliott Hughes
92b2d5a608
Merge "Pseudolocalizer improvements."
2014-04-18 22:32:53 +00:00
Mark Salyzyn
649da9b505
am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
...
* commit '5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
Native Runtime: Add LOG_ID_CRASH
2014-04-18 15:02:48 +00:00
Mark Salyzyn
5a47a9f62d
Merge "Native Runtime: Add LOG_ID_CRASH"
2014-04-18 14:55:32 +00:00
Mark Salyzyn
7423510c5a
am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
...
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
jni: binder ptrdiff_t compile issues
2014-04-18 00:43:36 +00:00
Mark Salyzyn
da93c60d8a
Merge "jni: binder ptrdiff_t compile issues"
2014-04-18 00:40:01 +00:00
Mark Salyzyn
5b6da1aee8
jni: binder ptrdiff_t compile issues
...
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
2014-04-17 17:25:36 -07:00
Mark Salyzyn
4037847c02
am 73258630: Merge "jni: binder 64-bit compile issues"
...
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
jni: binder 64-bit compile issues
2014-04-17 22:57:25 +00:00
Mark Salyzyn
7325863013
Merge "jni: binder 64-bit compile issues"
2014-04-17 22:52:58 +00:00
Mark Salyzyn
cfd91e7852
jni: binder 64-bit compile issues
...
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
2014-04-17 15:40:01 -07:00
Stephen Hines
f0aa4cc0f2
am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
...
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 18:20:47 +00:00
Stephen Hines
a48985349c
Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
2014-04-17 18:15:38 +00:00
Jason Sams
a4af5726c4
am 112d1b94: Merge "Add BiCubic resize instrinsic"
...
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
Add BiCubic resize instrinsic
2014-04-17 17:02:10 +00:00
Stephen Hines
414fa2c93a
Fix improper use of JNI_ABORT for operations where Java objects are written.
...
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.
Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
2014-04-17 01:02:42 -07:00
Jason Sams
112d1b94ee
Merge "Add BiCubic resize instrinsic"
2014-04-17 01:22:19 +00:00
Jason Sams
464af41b28
Add BiCubic resize instrinsic
...
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
2014-04-16 17:13:09 -07:00
Mark Salyzyn
936e87e12d
am 5788722d: Merge "frameworks: 64 bit compile issues"
...
* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
frameworks: 64 bit compile issues
2014-04-16 19:42:11 +00:00
Mark Salyzyn
5788722df7
Merge "frameworks: 64 bit compile issues"
2014-04-16 19:21:44 +00:00