OSDN Git Service
Elliott Hughes [Thu, 28 Mar 2013 15:47:33 +0000 (08:47 -0700)]
am
fd21b120: am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
fd21b120062976f20450ac3cf80f980b54c59e00':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:45:22 +0000 (08:45 -0700)]
am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
51c578b64b7cd3e2fb8c3370d398507e28a47adc':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:42:57 +0000 (08:42 -0700)]
am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
df0568374da4856271a1a678208c638a0276b169':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:41:21 +0000 (08:41 -0700)]
am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
ef64fc32d412d64e180cb90ee29ff46af7391580':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:29:43 +0000 (15:29 +0000)]
Merge "Track libcore DirectByteBuffer cleanup."
Elliott Hughes [Wed, 27 Mar 2013 23:23:35 +0000 (16:23 -0700)]
Track libcore DirectByteBuffer cleanup.
Bug: https://code.google.com/p/android/issues/detail?id=53637
Change-Id: I7acd990a2a48b41dacb5b09f6410b4634dd60438
Elliott Hughes [Wed, 27 Mar 2013 18:40:48 +0000 (11:40 -0700)]
am
ded82b0b: am
fe659ef3: am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
ded82b0bc843702b219751768841b062e6cfc586':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 18:38:36 +0000 (11:38 -0700)]
am
fe659ef3: am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
fe659ef319aa5ca6f4e8a263feee768dab2d3ea3':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 18:37:05 +0000 (11:37 -0700)]
am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
11905a146b94c7ec4a6880ad6f771d21abef0f31':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 00:27:53 +0000 (17:27 -0700)]
am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
694762158ac19c2abd795d7af78d3d9b9318a7d3':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 00:22:16 +0000 (00:22 +0000)]
Merge "pthread_create doesn't set errno."
Elliott Hughes [Tue, 26 Mar 2013 23:58:09 +0000 (16:58 -0700)]
am
c327b1e3: am
63a134f2: am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
c327b1e38dbec823d4f49c42adaa9a0a8042e3ed':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:55:36 +0000 (16:55 -0700)]
am
63a134f2: am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
63a134f2f2c2edd89116a6b8f53da97a07dcbf4e':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:51:12 +0000 (16:51 -0700)]
am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
6be063d7e6e1ff2224134852a628384d8d626636':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:25:15 +0000 (16:25 -0700)]
pthread_create doesn't set errno.
Let's try to get slightly better logging and exception detail messages.
Also fix the "set but not read" warnings for the other pthread functions
in this file.
Bug:
8470684
Change-Id: I7f9dbb4d39b4e3022cd5f1a8a45c6426e68c858b
Elliott Hughes [Tue, 26 Mar 2013 22:51:44 +0000 (15:51 -0700)]
am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
2a41b0b731a6b70410a7d23aa772ef1d17ad0e32':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 22:33:07 +0000 (22:33 +0000)]
Merge "Print the locker thread when waiting on an object"
The Android Open Source Project [Tue, 26 Mar 2013 19:17:44 +0000 (12:17 -0700)]
am
b0f9ba36: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b0f9ba36ea2c6bcd78398c62a8ee91d3b3e7fd12':
The Android Open Source Project [Tue, 26 Mar 2013 17:49:06 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0fe603df487fa9a987a7d450eef7e2aadb5dd090
The Android Automerger [Mon, 25 Mar 2013 12:55:33 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 21 Mar 2013 17:38:14 +0000 (17:38 +0000)]
am
b9a12d8f: am
20f0fe69: am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
b9a12d8ff38df30199088ebbf051a9508691ef4a':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:37:07 +0000 (17:37 +0000)]
am
20f0fe69: am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
20f0fe6909748e08ff7d0add9d08d497618ec94a':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:34:06 +0000 (10:34 -0700)]
am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
12b9e51f8089c250d2a1b7a45b56bb355c4eca59':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:32:11 +0000 (10:32 -0700)]
am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
77059520ccee59c57de58e4dbafcf2cf16d42f55':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:27:23 +0000 (17:27 +0000)]
Merge "javac should have matching -source and -target flags."
Elliott Hughes [Thu, 21 Mar 2013 17:25:39 +0000 (10:25 -0700)]
javac should have matching -source and -target flags.
Change-Id: I2ac5f0685bd5844252cc334d4040d68e01d39429
The Android Open Source Project [Wed, 20 Mar 2013 16:46:46 +0000 (16:46 +0000)]
am
6b094a67: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
6b094a67a25e6ebe53abb1748df05729244c125e':
The Android Open Source Project [Wed, 20 Mar 2013 16:32:16 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I63d012a7e3ff3411b6fa088f7daddffeda11fd79
The Android Automerger [Wed, 20 Mar 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Tue, 19 Mar 2013 23:53:17 +0000 (23:53 +0000)]
am
12bfdf20: am
57402cd5: am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
12bfdf2024180c3cd361b9d76ed7874864b6d2d1':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:50:46 +0000 (23:50 +0000)]
am
57402cd5: am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
57402cd539d30a6719d554b8bd9771f6d34230b4':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:48:06 +0000 (16:48 -0700)]
am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
e04f68bceb2a61fef67b2da4e2c2bd67fa113a23':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:46:18 +0000 (16:46 -0700)]
am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
06e6a1da8df286f7958f849a79a734b0b23d9b95':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:36:48 +0000 (23:36 +0000)]
Merge "Fix a Field.isAnnotationPresent crash."
Elliott Hughes [Tue, 19 Mar 2013 21:41:42 +0000 (14:41 -0700)]
Fix a Field.isAnnotationPresent crash.
For instances of Proxy, generated at runtime, there is no corresponding
.dex file.
Bug: https://code.google.com/p/android/issues/detail?id=24846
Change-Id: I36da43d5279a61b8cb71cdf2bbc3065b6a979830
The Android Automerger [Thu, 14 Mar 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 14 Mar 2013 06:15:36 +0000 (06:15 +0000)]
am
4b1163d3: am
26142726: am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
4b1163d303160cc3dbda8def49e7d84d332eb1d2':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 06:13:27 +0000 (06:13 +0000)]
am
26142726: am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
2614272692e34791a3f4bc598cb578889f1124ae':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 06:10:58 +0000 (23:10 -0700)]
am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
a5a8b91a337e0bb02ff1130e5362da2237acfb7d':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 01:49:49 +0000 (18:49 -0700)]
am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
217e8e0dc89f20638807bdd179d54056c45f7901':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 01:40:17 +0000 (01:40 +0000)]
Merge "Check JavaVMAttachArgs::version in CheckJNI."
Elliott Hughes [Thu, 14 Mar 2013 01:35:54 +0000 (18:35 -0700)]
Check JavaVMAttachArgs::version in CheckJNI.
Bug:
8363798
Change-Id: I314bf6d5d64a1e27ad2c1580532133859031c623
The Android Open Source Project [Tue, 12 Mar 2013 14:16:41 +0000 (14:16 +0000)]
am
b902a056: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b902a0562c2b292f83214c24694e39ecfed78319':
The Android Open Source Project [Tue, 12 Mar 2013 14:14:18 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I062436d66259d1d6a36f84c2802a89f42df11140
The Android Automerger [Thu, 7 Mar 2013 13:55:13 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 6 Mar 2013 16:59:04 +0000 (16:59 +0000)]
am
a84e2faa: am
c881b1e6: am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
a84e2faa59d0bda1abc9c844f90dff07cdfcf6c6':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:56:49 +0000 (16:56 +0000)]
am
c881b1e6: am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
c881b1e656d6b77f2c2f2ebd52c7ad23aa65be98':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:54:00 +0000 (16:54 +0000)]
am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
ff38bd30c42ecf85eab3d07efdb18b5c77cadb5a':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:51:28 +0000 (08:51 -0800)]
am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
b32addbf84d228e119268f94816a8e60dcd87214':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:35:01 +0000 (16:35 +0000)]
Merge "Don't crash if the dmtracedump -d file doesn't exist."
The Android Automerger [Wed, 6 Mar 2013 13:55:20 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 6 Mar 2013 06:42:37 +0000 (22:42 -0800)]
Don't crash if the dmtracedump -d file doesn't exist.
Change-Id: Ie4b504b43a8a61d09ca60d68b1a62694391ac223
Nick Kralevich [Tue, 5 Mar 2013 21:07:50 +0000 (21:07 +0000)]
am
a786f32d: am
b64e9cba: Zygote: set PR_SET_NO_NEW_PRIVS
* commit '
a786f32dbdebc7731abdb2d28de067f04706abf7':
Zygote: set PR_SET_NO_NEW_PRIVS
Nick Kralevich [Tue, 5 Mar 2013 21:05:24 +0000 (21:05 +0000)]
am
b64e9cba: Zygote: set PR_SET_NO_NEW_PRIVS
* commit '
b64e9cba72fb223fb440c150a951bb240df8beee':
Zygote: set PR_SET_NO_NEW_PRIVS
Nick Kralevich [Mon, 4 Mar 2013 19:38:30 +0000 (11:38 -0800)]
Zygote: set PR_SET_NO_NEW_PRIVS
call prctl(PR_SET_NO_NEW_PRIVS, 1) to prevent Zygote and zygote
spawned applications from aquiring new privileges.
Change-Id: I69bbf6bb5b01b877de414ecad43d3dffbd5fcea0
The Android Open Source Project [Mon, 4 Mar 2013 19:10:14 +0000 (19:10 +0000)]
am
c0132915: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
c01329154dadbd8bc9928256a7d15c06a6447fbe':
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
The Android Open Source Project [Mon, 4 Mar 2013 19:06:32 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id42d349a9e211c06f73f33214d97875c6ec7beb4
The Android Automerger [Mon, 4 Mar 2013 13:55:15 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Fri, 1 Mar 2013 19:17:00 +0000 (19:17 +0000)]
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
6e2d46fd7488331181502a878959336966ac3776':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:21:45 +0000 (19:21 +0000)]
am
36ba3589: am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:17:00 +0000 (19:17 +0000)]
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
6e2d46fd7488331181502a878959336966ac3776':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:14:57 +0000 (11:14 -0800)]
am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
03a938bca80d83378844f7923bc2f8c6e6ec64a7':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:05:44 +0000 (19:05 +0000)]
Merge "Fix -Xjitthreshold (for real this time)."
Elliott Hughes [Fri, 1 Mar 2013 18:45:01 +0000 (10:45 -0800)]
Fix -Xjitthreshold (for real this time).
My previous "fix" (
c89d83e1c05979b68037ad15413fa4460a88e36f) had the
conditions reversed, so you _had_ to use -Xjitthreshold to get a non-zero
threshold, but when you did, you'd get the default instead of what you
asked for!
This was spotted by the jank tests.
Bug:
8285558
Bug: https://code.google.com/p/android/issues/detail?id=52017
Change-Id: I28270f2573d46929eb10d30789fecf7d5a8cea75
Nick Kralevich [Thu, 28 Feb 2013 22:48:04 +0000 (22:48 +0000)]
am
949e13c9: Merge "Zygote: remount /system nosuid/nodev" into jb-mr2-dev
* commit '
949e13c9c9d14c3749279e9a8af19bccbeca509f':
Zygote: remount /system nosuid/nodev
Nick Kralevich [Thu, 28 Feb 2013 22:43:30 +0000 (22:43 +0000)]
Merge "Zygote: remount /system nosuid/nodev" into jb-mr2-dev
Nick Kralevich [Thu, 28 Feb 2013 22:16:32 +0000 (22:16 +0000)]
am
963589fa: am
4ff70bc3: am
1319ed83: Merge "Zygote: use proper header file."
* commit '
963589fa4f8111553731b7c63a59b4007c8194fc':
Zygote: use proper header file.
Nick Kralevich [Wed, 27 Feb 2013 23:39:41 +0000 (15:39 -0800)]
Zygote: remount /system nosuid/nodev
Android no longer has any setuid / setgid programs accessible
to zygote. Make sure /system is remounted nosuid and nodev
for zygote spawned processes.
We use mount namespaces to make sure these changes are
only visible to zygote spawned processes. We continue to need
/system mounted with suid to support /system/bin/run-as.
See also: b/
8253345
Change-Id: Ib58a8d56b42e4b022b6b4e51932f0a415298c920
Nick Kralevich [Wed, 27 Feb 2013 23:45:46 +0000 (23:45 +0000)]
am
4ff70bc3: am
1319ed83: Merge "Zygote: use proper header file."
* commit '
4ff70bc357048e57f3425a4363bfcf7f25906282':
Zygote: use proper header file.
Nick Kralevich [Wed, 27 Feb 2013 23:43:38 +0000 (15:43 -0800)]
am
1319ed83: Merge "Zygote: use proper header file."
* commit '
1319ed83a94fd506e54a43d6cef8b6bb2295c525':
Zygote: use proper header file.
Nick Kralevich [Wed, 27 Feb 2013 23:32:18 +0000 (23:32 +0000)]
am
64d4c47f: Merge "Revert "Zygote: remount /system nosuid/nodev"" into jb-mr2-dev
* commit '
64d4c47f1869c5f655f9a1bbdc57ad977b76f817':
Revert "Zygote: remount /system nosuid/nodev"
Nick Kralevich [Wed, 27 Feb 2013 23:25:40 +0000 (23:25 +0000)]
Merge "Revert "Zygote: remount /system nosuid/nodev"" into jb-mr2-dev
Nick Kralevich [Wed, 27 Feb 2013 23:25:18 +0000 (23:25 +0000)]
Merge "Zygote: use proper header file."
Nick Kralevich [Wed, 27 Feb 2013 23:23:25 +0000 (23:23 +0000)]
am
24f95567: am
82661b8d: am
09deb1a3: Merge "Remove CAP_NET_RAW from zygote"
* commit '
24f955676f077fb8a2dab1c85f4995149d0945e1':
Remove CAP_NET_RAW from zygote
Nick Kralevich [Wed, 27 Feb 2013 23:17:09 +0000 (15:17 -0800)]
Revert "Zygote: remount /system nosuid/nodev"
This is causing problems when people do development. Any
"adb shell stop && adb shell start" will have the side effect of
remounting /system read-only, breaking a subsequent "adb sync".
This reverts commit
2d37f9a1eb7f5375e8cad9ccb59d96d650d18f6e.
Nick Kralevich [Wed, 27 Feb 2013 21:30:44 +0000 (21:30 +0000)]
am
82661b8d: am
09deb1a3: Merge "Remove CAP_NET_RAW from zygote"
* commit '
82661b8d82ad7820486f4eced36c2b2d04fb0e59':
Remove CAP_NET_RAW from zygote
Nick Kralevich [Wed, 27 Feb 2013 21:29:17 +0000 (13:29 -0800)]
am
09deb1a3: Merge "Remove CAP_NET_RAW from zygote"
* commit '
09deb1a3ef8708b2372f2824ab68e22f4e9fad85':
Remove CAP_NET_RAW from zygote
Nick Kralevich [Wed, 27 Feb 2013 21:24:09 +0000 (21:24 +0000)]
Merge "Remove CAP_NET_RAW from zygote"
Nick Kralevich [Wed, 27 Feb 2013 20:59:06 +0000 (12:59 -0800)]
Remove CAP_NET_RAW from zygote
ping no longer needs CAP_NET_RAW. See:
* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072
Eliminate the CAP_NET_RAW special case in zygote.
Change-Id: Ie4b1d2b65a27051bbd2825d288f9838762ae31c8
Nick Kralevich [Wed, 27 Feb 2013 00:20:11 +0000 (16:20 -0800)]
Zygote: use proper header file.
capset is defined in <sys/capability.h>
Change-Id: Ifb340cfb3506830242749456706d4eddb73fb2aa
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:48:38 +0000 (22:48 +0000)]
am
df08503f: (-s ours) am
276d0480: am
e5310471: am
d8232960: am
68719a17: Reconcile with jb-mr1-release - do not merge
* commit '
df08503fd3a9829a5466927e8e5b779cd62aae1e':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:43:16 +0000 (22:43 +0000)]
am
276d0480: am
e5310471: am
d8232960: am
68719a17: Reconcile with jb-mr1-release - do not merge
* commit '
276d048057158491d11052773d0d0f78463f2229':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:30:41 +0000 (14:30 -0800)]
am
e5310471: am
d8232960: am
68719a17: Reconcile with jb-mr1-release - do not merge
* commit '
e5310471a381eb5e850dba0603ce03c0ec3a00cc':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:28:12 +0000 (14:28 -0800)]
am
d8232960: am
68719a17: Reconcile with jb-mr1-release - do not merge
* commit '
d8232960dfe3e0fd1a3c37d3b1e9c281ff886d5d':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:27:01 +0000 (14:27 -0800)]
am
68719a17: Reconcile with jb-mr1-release - do not merge
* commit '
68719a176eacf86d19813a38f59041f3b209693d':
Jean-Baptiste Queru [Tue, 26 Feb 2013 22:03:05 +0000 (14:03 -0800)]
Reconcile with jb-mr1-release - do not merge
Elliott Hughes [Tue, 26 Feb 2013 01:33:44 +0000 (01:33 +0000)]
am
7f77254e: Merge "Fix -Xjitthreshold."
* commit '
7f77254e7ba273c18bd77313c6074029d3f79f79':
Fix -Xjitthreshold.
Elliott Hughes [Tue, 26 Feb 2013 01:24:30 +0000 (01:24 +0000)]
Merge "Fix -Xjitthreshold."
Elliott Hughes [Tue, 26 Feb 2013 01:04:06 +0000 (17:04 -0800)]
Fix -Xjitthreshold.
Previously, we'd always overwrite the user-supplied value because
the architecture-specific default gets set so late.
Bug: https://code.google.com/p/android/issues/detail?id=52017
Change-Id: I469bf9ce599820f5ce3dea346aa8f680deffb0c5
Nick Kralevich [Mon, 25 Feb 2013 20:13:27 +0000 (12:13 -0800)]
Zygote: remount /system nosuid/nodev
Android no longer has any setuid / setgid programs accessible
to zygote. Make sure /system is remounted nosuid and nodev
for zygote spawned processes.
We use mount namespaces to make sure these changes are
only visible to zygote spawned processes. We continue to need
/system mounted with suid to support /system/bin/run-as.
See also: b/
8253345
Change-Id: I959512520461f22d1fd88c12a2785a362639f7ed
Elliott Hughes [Sat, 23 Feb 2013 01:42:28 +0000 (17:42 -0800)]
am
61862ffe: Merge "Abstract methods aren\'t implementations."
* commit '
61862ffe7e66f2893586e5743705074e72e55c03':
Abstract methods aren't implementations.
Elliott Hughes [Sat, 23 Feb 2013 01:32:09 +0000 (01:32 +0000)]
Merge "Abstract methods aren't implementations."
Elliott Hughes [Sat, 23 Feb 2013 01:04:54 +0000 (17:04 -0800)]
Abstract methods aren't implementations.
We should only be checking the visibility of actual implementations
of interface methods. Intervening abstract methods are allowed to
be non-public.
Bug: https://code.google.com/p/android/issues/detail?id=42991
Change-Id: I510d0cc6c1f89d161d4ebad7ef058c03fa09e9b0
Nick Kralevich [Wed, 20 Feb 2013 22:53:30 +0000 (14:53 -0800)]
am
e3b5678e: Merge "Zygote: replace set?id() with setres?id()"
* commit '
e3b5678ea4bea457f2190adea6745ddba673a75e':
Zygote: replace set?id() with setres?id()
Nick Kralevich [Wed, 20 Feb 2013 22:29:22 +0000 (22:29 +0000)]
Merge "Zygote: replace set?id() with setres?id()"
Nick Kralevich [Wed, 20 Feb 2013 21:56:11 +0000 (13:56 -0800)]
Zygote: replace set?id() with setres?id()
setuid -> setresuid()
setgid -> setresgid()
Change-Id: I319a6a0ea63cf5bd3755ec8371064365be30872b
Elliott Hughes [Wed, 20 Feb 2013 20:06:08 +0000 (12:06 -0800)]
am
c4daf7b5: Merge "Expand test 004-annotations to cover package annotations."
* commit '
c4daf7b52ce5a8e4de81b1569d2f49c3024965da':
Expand test 004-annotations to cover package annotations.
Elliott Hughes [Wed, 20 Feb 2013 19:50:04 +0000 (19:50 +0000)]
Merge "Expand test 004-annotations to cover package annotations."
Elliott Hughes [Wed, 20 Feb 2013 19:19:32 +0000 (11:19 -0800)]
Expand test 004-annotations to cover package annotations.
Bug: https://code.google.com/p/android/issues/detail?id=16149
Change-Id: I0fa26a5201fc80a6f049d61d34e403d4cb5c505a
Elliott Hughes [Tue, 19 Feb 2013 19:18:53 +0000 (11:18 -0800)]
am
f9528fea: Merge "Added missing initialization of modLock when DvmDex structures are allocated."
* commit '
f9528fea2e2ee8c9b41da2987e68dd64e58cf54b':
Added missing initialization of modLock when DvmDex structures are allocated.