Michael Wright
8a02b20f6f
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
2014-04-29 23:58:17 +00:00
Nick Kralevich
af40649e4a
Merge "Set NO_NEW_PRIVS on zygote init"
2014-04-29 22:20:47 +00:00
Nick Kralevich
195c73c9b2
Set NO_NEW_PRIVS on zygote init
...
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
2014-04-29 15:10:58 -07:00
Selim Gurun
5c220cc4e4
Merge "DO NOT MERGE Add invokeFunctor stub"
2014-04-29 18:42:25 +00:00
Bo Liu
02931d9af6
DO NOT MERGE Add invokeFunctor stub
...
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
2014-04-29 11:38:37 -07:00
Elliott Hughes
10d57c4bc7
Merge "Fix two zygote imports."
2014-04-29 03:54:49 +00:00
Elliott Hughes
a9569ff70f
Fix two zygote imports.
...
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
2014-04-28 20:53:52 -07:00
Elliott Hughes
2e9d924d4f
Merge "Remove unused import."
2014-04-29 03:52:11 +00:00
Elliott Hughes
f25f14eeba
Remove unused import.
...
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
2014-04-28 20:51:34 -07:00
Elliott Hughes
f4a7ac00a7
Merge "Move the Zygote off libcore.os and onto android.system."
2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2
Move the Zygote off libcore.os and onto android.system.
...
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
2014-04-28 19:19:13 -07:00
Elliott Hughes
2336c4ecc5
Merge "Fix build."
2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee
Fix build.
...
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
2014-04-28 12:40:12 -07:00
Elliott Hughes
bbd87eb919
Merge "Track libcore.os' move to android.system."
2014-04-28 18:14:00 +00:00
Elliott Hughes
34385d352d
Track libcore.os' move to android.system.
...
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Mathieu Chartier
0cd623bb9f
Merge "Use Runtime.gc instead of System.gc for DDMS."
2014-04-28 18:10:42 +00:00
Mathieu Chartier
83f7d0d67f
Use Runtime.gc instead of System.gc for DDMS.
...
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.
Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
2014-04-28 11:07:22 -07:00
Wink Saville
3f4867f49d
Merge "Telephony: Add functionality to handle ICC IO error"
2014-04-25 23:58:11 +00:00
Mark Salyzyn
ac7327082c
Merge "EventLog: event log translation errors"
2014-04-25 21:59:19 +00:00
Mark Salyzyn
747802f8aa
EventLog: event log translation errors
...
- Deal with L using v3 event log format, or K using v1 or v2 event log format
Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
2014-04-25 13:45:03 -07:00
Marco Nelissen
adcf38c993
Merge "Release DrmManagerClient resources"
2014-04-25 14:42:02 +00:00
Selim Gurun
8c2d70f5e8
Merge "Add a stub for forgotten callback to fix master-gpl."
2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03
Add a stub for forgotten callback to fix master-gpl.
...
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
2014-04-24 18:04:04 -07:00
Selim Gurun
adad989b6a
Merge "Add a stub to fix master-gpl"
2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3
Add a stub to fix master-gpl
...
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
2014-04-24 17:31:07 -07:00
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
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
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
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
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
53b7df19cf
Merge "Add missing ICU_Delegate methods."
2014-04-22 23:08:06 +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
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
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
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
92b2d5a608
Merge "Pseudolocalizer improvements."
2014-04-18 22:32:53 +00:00
Mark Salyzyn
5a47a9f62d
Merge "Native Runtime: Add LOG_ID_CRASH"
2014-04-18 14:55:32 +00:00
Mark Salyzyn
da93c60d8a
Merge "jni: binder ptrdiff_t compile issues"
2014-04-18 00:40:01 +00:00