OSDN Git Service
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.
Elliott Hughes [Tue, 19 Feb 2013 19:01:26 +0000 (19:01 +0000)]
Merge "Added missing initialization of modLock when DvmDex structures are allocated."
msg555 [Tue, 19 Feb 2013 14:47:28 +0000 (09:47 -0500)]
Added missing initialization of modLock when DvmDex structures are allocated.
The structure is zeroed with dvmAllocRegion (use to be calloc) which for most
implementations of pthreads behaves correctly as if initialized. However, an explicit
initialization is more correct.
Change-Id: I172fed73c2a8a6962d720f78c60436b4f58cc168
Elliott Hughes [Fri, 15 Feb 2013 23:38:21 +0000 (15:38 -0800)]
am
a8eb3e76: Merge "Move the arraycopy implementation out of bionic and into dalvik."
* commit '
a8eb3e76514e13508e6a0ad1a0426451a9e9aeab':
Move the arraycopy implementation out of bionic and into dalvik.
Elliott Hughes [Fri, 15 Feb 2013 23:22:05 +0000 (23:22 +0000)]
Merge "Move the arraycopy implementation out of bionic and into dalvik."
Elliott Hughes [Fri, 15 Feb 2013 22:25:15 +0000 (14:25 -0800)]
Move the arraycopy implementation out of bionic and into dalvik.
Change-Id: I5b7964e53eca6f2da949d6ef24d42a9c6ed3996c
Nick Kralevich [Thu, 14 Feb 2013 19:23:49 +0000 (11:23 -0800)]
am
e61da40b: Merge "Zygote: address comments from previous review."
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
e61da40b35ed522d88da272b8e8b87a15c1eab76':
Zygote: address comments from previous review.
Nick Kralevich [Thu, 14 Feb 2013 19:11:46 +0000 (19:11 +0000)]
Merge "Zygote: address comments from previous review."
Nick Kralevich [Thu, 14 Feb 2013 19:09:50 +0000 (11:09 -0800)]
am
d43bc05e: Merge "Zygote: limit the bounding capability set to CAP_NET_RAW"
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
d43bc05e7b3fe5f7baaadb8de2510658df610e7d':
Zygote: limit the bounding capability set to CAP_NET_RAW
Nick Kralevich [Thu, 14 Feb 2013 19:00:33 +0000 (11:00 -0800)]
Zygote: address comments from previous review.
Previous review at https://android-review.googlesource.com/51731
Change-Id: Idfe6c95976cc8f82ec473bcb630678fa9ec9486a
Nick Kralevich [Thu, 14 Feb 2013 18:50:37 +0000 (18:50 +0000)]
Merge "Zygote: limit the bounding capability set to CAP_NET_RAW"
Nick Kralevich [Thu, 14 Feb 2013 17:56:41 +0000 (09:56 -0800)]
Zygote: limit the bounding capability set to CAP_NET_RAW
Prevent a zygote spawned application from acquiring
capabilities other than CAP_NET_RAW. The only Zygote
accessible program on Android which grants capabilities
is /system/bin/ping (CAP_NET_RAW), so we don't need to
keep the other capabilities in our bounding set.
If the kernel doesn't support file capabilities, we
end up printing approx 30 lines of warning messages. Hopefully
this will encourage kernel developers to upgrade. In a future
change, we can turn a prctl(PR_CAPBSET_DROP) failure into
a fatal error.
Change-Id: I8560fa5ad125bf31f0d13be513431697bc7d22bb
Elliott Hughes [Thu, 14 Feb 2013 18:28:33 +0000 (10:28 -0800)]
am
43654a84: Merge "Remove stray references to non-existent opcodes."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
43654a84878e5d320453bb998fa00284a5366dde':
Remove stray references to non-existent opcodes.
Elliott Hughes [Thu, 14 Feb 2013 18:20:14 +0000 (18:20 +0000)]
Merge "Remove stray references to non-existent opcodes."
Elliott Hughes [Thu, 14 Feb 2013 18:09:00 +0000 (10:09 -0800)]
Remove stray references to non-existent opcodes.
Change-Id: I83ca6ea12344a8df7ef14d600baf5060b76870f5
Elliott Hughes [Thu, 14 Feb 2013 01:46:26 +0000 (17:46 -0800)]
am
2d28dc96: Merge "Revert "Zygote: limit the bounding capability set to CAP_NET_RAW""
# Via Gerrit Code Review
* commit '
2d28dc96680059afeba8910a539782f29613e06a':
Revert "Zygote: limit the bounding capability set to CAP_NET_RAW"
Elliott Hughes [Thu, 14 Feb 2013 01:29:29 +0000 (01:29 +0000)]
Merge "Revert "Zygote: limit the bounding capability set to CAP_NET_RAW""
Elliott Hughes [Thu, 14 Feb 2013 01:29:19 +0000 (01:29 +0000)]
Revert "Zygote: limit the bounding capability set to CAP_NET_RAW"
This reverts commit
921e9aea72bc2aa99a52ccdb90573bbd3bf3508f, which prevents the emulator from booting.
Change-Id: I73b7afba38d4087d552dd685c56d4e5ddb3103cf
Nick Kralevich [Wed, 13 Feb 2013 21:59:48 +0000 (13:59 -0800)]
am
6686e50b: Merge "Zygote: limit the bounding capability set to CAP_NET_RAW"
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
6686e50b2135dfef88c2f0ee0cfa9a3e0d7ad980':
Zygote: limit the bounding capability set to CAP_NET_RAW
Nick Kralevich [Wed, 13 Feb 2013 21:38:08 +0000 (21:38 +0000)]
Merge "Zygote: limit the bounding capability set to CAP_NET_RAW"
Nick Kralevich [Wed, 13 Feb 2013 18:39:34 +0000 (10:39 -0800)]
Zygote: limit the bounding capability set to CAP_NET_RAW
Prevent a zygote spawned application from acquiring
capabilities other than CAP_NET_RAW. The only Zygote
accessible program on Android which grants capabilities
is /system/bin/ping (CAP_NET_RAW), so we don't need to
keep the other capabilities in our bounding set.
Change-Id: Ifbfdbaf3d32bc6237b6e1fc57766ca13baae7bde
buzbee [Tue, 12 Feb 2013 00:52:31 +0000 (16:52 -0800)]
Fix JIT bug related to immediate doubles
Change 256211 (JIT: Performance Fix for const doubles) introduced a
defect that can cause the JIT to use the wrong floating point
double constant in traces in which the following conditions hold:
o Two (or more) different 64-bit floating point constants are used.
o The physical register holding the first constant is still live
at the time the second constant is used.
o The low 32 bits of the two constants are identical.
In this situation, the load/copy optimization pass will incorrectly
determine that the two constants are the same, delete the load of
the second constant and re-use the first constant value.
Note: this problem only occurs with 64-bit floating point literals.
64-bit long literals are unaffected.
This CL works around the problem, and a subsequent CL will rework
disambiguation of 64-bit immediates in a somewhat cleaner fashion.
Change-Id: I33baf78402bab58d9b0ca46189f26491c2b2a751
Nick Kralevich [Wed, 6 Feb 2013 00:23:00 +0000 (16:23 -0800)]
am
896f1774: am
43241340: Merge "Use execv from Libcore"
# Via Android Git Automerger (1) and others
* commit '
896f17741aa4d897dcd9a7cb08bbbcbff93dbc60':
Use execv from Libcore
Nick Kralevich [Wed, 6 Feb 2013 00:17:31 +0000 (16:17 -0800)]
am
43241340: Merge "Use execv from Libcore"
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
43241340b1456eec0a19175d6a642c78f8354ae5':
Use execv from Libcore
Nick Kralevich [Wed, 6 Feb 2013 00:14:21 +0000 (00:14 +0000)]
Merge "Use execv from Libcore"
Nick Kralevich [Tue, 5 Feb 2013 21:18:29 +0000 (13:18 -0800)]
Use execv from Libcore
Change-Id: Idc862adef2a95636c85992e1954651b4e0bcaf16
Elliott Hughes [Tue, 5 Feb 2013 20:53:35 +0000 (12:53 -0800)]
am
5d89bdf5: am
ecc334ea: Merge "Fix a tracked reference leak in dvmGenerateProxyClass."
# Via Android Git Automerger (1) and others
* commit '
5d89bdf5518e82422a726a68cf13d8cd60879596':
Fix a tracked reference leak in dvmGenerateProxyClass.
Elliott Hughes [Tue, 5 Feb 2013 20:50:08 +0000 (12:50 -0800)]
am
ecc334ea: Merge "Fix a tracked reference leak in dvmGenerateProxyClass."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
ecc334eaf1dd36f28b9e8402302aa94a57b93274':
Fix a tracked reference leak in dvmGenerateProxyClass.
Elliott Hughes [Tue, 5 Feb 2013 20:47:51 +0000 (20:47 +0000)]
Merge "Fix a tracked reference leak in dvmGenerateProxyClass."
Elliott Hughes [Tue, 5 Feb 2013 19:22:16 +0000 (11:22 -0800)]
Fix a tracked reference leak in dvmGenerateProxyClass.
Bug: https://code.google.com/p/android/issues/detail?id=43919
Change-Id: Ib5c217368ba75f4422d0c932c2c67daaaeddea4b
Jeff Hao [Mon, 4 Feb 2013 19:29:32 +0000 (11:29 -0800)]
am
4e9fc028: am
ad9811c9: Merge "Remove dead instruction in common_exceptionThrown."
# Via Android Git Automerger (1) and others
* commit '
4e9fc0288d40c5b158f3212958d7331b230e9162':
Remove dead instruction in common_exceptionThrown.
Jeff Hao [Sat, 2 Feb 2013 01:42:54 +0000 (17:42 -0800)]
am
ad9811c9: Merge "Remove dead instruction in common_exceptionThrown."
# Via Gerrit Code Review (1) and Jeff Hao (1)
* commit '
ad9811c9f7be61f536b03ff372db1c94fa41a05e':
Remove dead instruction in common_exceptionThrown.
Jeff Hao [Sat, 2 Feb 2013 01:26:01 +0000 (01:26 +0000)]
Merge "Remove dead instruction in common_exceptionThrown."
Jeff Hao [Sat, 2 Feb 2013 01:17:57 +0000 (17:17 -0800)]
Remove dead instruction in common_exceptionThrown.
Addresses bug: https://code.google.com/p/android/issues/detail?id=43920
Change-Id: Ie735222db17b883416543ca5617b4f02fd8a8d76
Nick Kralevich [Tue, 29 Jan 2013 20:24:52 +0000 (12:24 -0800)]
am
25ce21cf: am
a43a4d37: am
8828aee2: Merge "dvz: remove dead code."
# Via Android Git Automerger (2) and others
* commit '
25ce21cfa0928ff2ba4a64f4bf993f3d50966839':
dvz: remove dead code.
Nick Kralevich [Tue, 29 Jan 2013 20:22:31 +0000 (12:22 -0800)]
am
a43a4d37: am
8828aee2: Merge "dvz: remove dead code."
# Via Android Git Automerger (1) and others
* commit '
a43a4d371466b9efbb93be3d19d8c6c88e8cee46':
dvz: remove dead code.
Nick Kralevich [Tue, 29 Jan 2013 20:19:46 +0000 (12:19 -0800)]
am
8828aee2: Merge "dvz: remove dead code."
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
8828aee2eba996d3cd4aab27c912248d5437b1a0':
dvz: remove dead code.
Nick Kralevich [Tue, 29 Jan 2013 20:04:46 +0000 (20:04 +0000)]
Merge "dvz: remove dead code."
Nick Kralevich [Tue, 29 Jan 2013 18:28:31 +0000 (10:28 -0800)]
dvz: remove dead code.
dvz is never used. Delete it.
Change-Id: If2b5ccbf6668a1044a0d57e09ce6d0c0923c6c76
Elliott Hughes [Wed, 23 Jan 2013 01:12:13 +0000 (17:12 -0800)]
am
25038b58: am
af6fe2d2: am
604d7243: Merge "rTEMP gets clobbered in the JALR macro. Use t9 instead."
* commit '
25038b580a8ecf28e3a70722268fbbfa624ff5de':
rTEMP gets clobbered in the JALR macro. Use t9 instead.
Elliott Hughes [Wed, 23 Jan 2013 00:58:01 +0000 (16:58 -0800)]
am
af6fe2d2: am
604d7243: Merge "rTEMP gets clobbered in the JALR macro. Use t9 instead."
* commit '
af6fe2d2a10e36caed1cf6e45b5de66bfa50e882':
rTEMP gets clobbered in the JALR macro. Use t9 instead.
Elliott Hughes [Wed, 23 Jan 2013 00:55:28 +0000 (16:55 -0800)]
am
604d7243: Merge "rTEMP gets clobbered in the JALR macro. Use t9 instead."
* commit '
604d724354695ddcc65f62b10ed2243400901e2e':
rTEMP gets clobbered in the JALR macro. Use t9 instead.
Elliott Hughes [Wed, 23 Jan 2013 00:41:37 +0000 (00:41 +0000)]
Merge "rTEMP gets clobbered in the JALR macro. Use t9 instead."
Raghu Gandham [Wed, 23 Jan 2013 00:02:42 +0000 (16:02 -0800)]
rTEMP gets clobbered in the JALR macro. Use t9 instead.
Change-Id: I0ac806c9ad73acf766a8b233997da33b794365be
Ian Rogers [Tue, 15 Jan 2013 02:01:48 +0000 (18:01 -0800)]
am
793fbb71: am
e59bd16c: am
8b0367ca: Merge "Fix DDMS crash"
* commit '
793fbb71e7c8b33cbd8f67c81553a06af6dcfe60':
Fix DDMS crash
Ian Rogers [Tue, 15 Jan 2013 00:42:33 +0000 (16:42 -0800)]
am
e59bd16c: am
8b0367ca: Merge "Fix DDMS crash"
* commit '
e59bd16cd4d9b552acff632a625f695c447ac39b':
Fix DDMS crash
Ian Rogers [Tue, 15 Jan 2013 00:39:56 +0000 (16:39 -0800)]
am
8b0367ca: Merge "Fix DDMS crash"
* commit '
8b0367ca57d7021f74e09010f731958cfd854ed3':
Fix DDMS crash
Ian Rogers [Tue, 15 Jan 2013 00:30:01 +0000 (16:30 -0800)]
Merge "Fix DDMS crash"
Tim Murray [Mon, 14 Jan 2013 22:09:33 +0000 (14:09 -0800)]
Fix DDMS crash
(cherry-pick of
22d8dba8ae5be7aecb07322a410712206896fa15)
Change-Id: Ic5edd3d9367db8570523e1380c3e6edfabeec2c0
Tim Murray [Mon, 14 Jan 2013 22:09:33 +0000 (14:09 -0800)]
fix DDMS crash
Change-Id: Ic5edd3d9367db8570523e1380c3e6edfabeec2c0
Elliott Hughes [Thu, 3 Jan 2013 00:51:21 +0000 (16:51 -0800)]
am
80cf74ee: am
44b6dae3: am
c3245cfe: Merge "DexDump: Leak in FieldMethodInfo.signature"
* commit '
80cf74ee95cbf1afa427226943fa9d578b8c6ed1':
DexDump: Leak in FieldMethodInfo.signature
Elliott Hughes [Thu, 3 Jan 2013 00:49:10 +0000 (16:49 -0800)]
am
44b6dae3: am
c3245cfe: Merge "DexDump: Leak in FieldMethodInfo.signature"
* commit '
44b6dae3f93ed8c010165ef46dcce44e9912ea85':
DexDump: Leak in FieldMethodInfo.signature
Elliott Hughes [Thu, 3 Jan 2013 00:47:47 +0000 (16:47 -0800)]
am
c3245cfe: Merge "DexDump: Leak in FieldMethodInfo.signature"
* commit '
c3245cfe4246d0cb2e276cf525940fdc6df8213f':
DexDump: Leak in FieldMethodInfo.signature
jwilson [Thu, 3 Jan 2013 00:34:41 +0000 (16:34 -0800)]
am
2f75f9ea: (-s ours) am
8b135734: am
cbac7aed: am
51997559: Fail if the new index is out of range. do not merge.
* commit '
2f75f9ea763c46a8973e7899c7c81e0f638f2fe6':
Fail if the new index is out of range. do not merge.
Elliott Hughes [Thu, 3 Jan 2013 00:33:23 +0000 (16:33 -0800)]
Merge "DexDump: Leak in FieldMethodInfo.signature"
jwilson [Wed, 2 Jan 2013 22:01:42 +0000 (14:01 -0800)]
am
8b135734: am
cbac7aed: am
51997559: Fail if the new index is out of range. do not merge.
* commit '
8b13573481b2af0b6e4fdbb175b9e1f8b02baed4':
Fail if the new index is out of range. do not merge.
jwilson [Wed, 2 Jan 2013 21:59:40 +0000 (13:59 -0800)]
am
cbac7aed: am
51997559: Fail if the new index is out of range. do not merge.
* commit '
cbac7aed2621a0d51ecddf89af0b3c4a110a17df':
Fail if the new index is out of range. do not merge.
jwilson [Wed, 2 Jan 2013 21:57:43 +0000 (13:57 -0800)]
am
51997559: Fail if the new index is out of range. do not merge.
* commit '
519975591eba13ae7ac4e494a0dfb88a34ca191b':
Fail if the new index is out of range. do not merge.
jwilson [Mon, 17 Dec 2012 18:16:33 +0000 (13:16 -0500)]
Fail if the new index is out of range. do not merge.
We were silently truncating, which made an obvious problem
into a non-obvious one.
Bug: http://code.google.com/p/android/issues/detail?id=40409
(cherry picked from commit
0a752f071fbbdfeab5dd9a230efe0f4f47b8cd94)
Change-Id: I6adbe6309bdcb2882f0e5500d6e1e149d08dbd2d
Elliott Hughes [Fri, 28 Dec 2012 17:48:18 +0000 (09:48 -0800)]
am
adfb17a5: am
d0380673: Merge "Support System.loadLibrary for libraries with transitive dependencies."
* commit '
adfb17a50a9d1f715e14383705be3a7cc6266495':
Support System.loadLibrary for libraries with transitive dependencies.
Elliott Hughes [Fri, 28 Dec 2012 17:48:10 +0000 (09:48 -0800)]
am
3634efb8: am
2e5f16bf: Merge "Fix a forecopy/forcecopy typo."
* commit '
3634efb898a39322dbb715a5358f76ef5a8eacae':
Fix a forecopy/forcecopy typo.
Elliott Hughes [Fri, 28 Dec 2012 17:47:25 +0000 (09:47 -0800)]
am
6dc914df: am
47160283: Merge "Add JNI statistics to the SIGQUIT output."
* commit '
6dc914df7a2db3082c44d79bb972d1a07693d7be':
Add JNI statistics to the SIGQUIT output.
You Kim [Tue, 25 Dec 2012 14:51:01 +0000 (23:51 +0900)]
DexDump: Leak in FieldMethodInfo.signature
Free pMethInfo->signature when filled by getMethodInfo.
Change-Id: Id278d732374daceb7b8b05be7f433af25eee0c27
Elliott Hughes [Sat, 22 Dec 2012 01:52:41 +0000 (17:52 -0800)]
am
d0380673: Merge "Support System.loadLibrary for libraries with transitive dependencies."
* commit '
d038067321dbf062089bfc7cda27955a78690a4b':
Support System.loadLibrary for libraries with transitive dependencies.
Elliott Hughes [Sat, 22 Dec 2012 01:50:09 +0000 (17:50 -0800)]
Merge "Support System.loadLibrary for libraries with transitive dependencies."