OSDN Git Service
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:31:29 +0000 (22:31 -0700)]
am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
840d233c12200de9260c85d6eadbc73b41cef00b':
Jean-Baptiste Queru [Fri, 14 Jun 2013 04:07:35 +0000 (21:07 -0700)]
am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
800e4320ba0815bfe7831deab99f5d600800663f':
Jean-Baptiste Queru [Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)]
am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63c34b5e2aae446b76fdf34f0ff895e35cd7376a':
Xavier Ducrohet [Thu, 25 Apr 2013 02:07:33 +0000 (19:07 -0700)]
am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
60db431fe44afb723654a19494b1ba0f35a735f0':
Fix dx to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:05:34 +0000 (19:05 -0700)]
am
4b724cff: Fix dx to match the new SDK structure.
* commit '
4b724cff027771d0d905809605b5cc50df220a4a':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:01:15 +0000 (19:01 -0700)]
am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
2f23f4cb813a810bb79f2ea09733b37c9af7639b':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 01:59:15 +0000 (18:59 -0700)]
am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
c26c1291743ce7877cf11f3dc73d6f0c240229f7':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
(cherry picked from commit
cb9dfa123c6fcc43be629666837c4e6f86b476ea)
Change-Id: I071d73adc4a2eb812cdbc204d27884f4a527043d
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
Change-Id: I2c125bb40c7c64e010642274b482733c52b5c11e
Elliott Hughes [Fri, 29 Mar 2013 17:19:31 +0000 (10:19 -0700)]
am
9813216f: Merge "Track 64-bit nio changes."
* commit '
9813216f8845e1c4a6dc4d2a10aa227e7d43f858':
Track 64-bit nio changes.
Elliott Hughes [Fri, 29 Mar 2013 17:14:49 +0000 (17:14 +0000)]
Merge "Track 64-bit nio changes."
Elliott Hughes [Fri, 29 Mar 2013 16:59:23 +0000 (09:59 -0700)]
Track 64-bit nio changes.
Change-Id: Id7a11af5f94b8ba82d42e1e7045302aca533f31a
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 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: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"
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
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
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
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."
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
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 [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:25:18 +0000 (23:25 +0000)]
Merge "Zygote: use proper header file."
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 [Wed, 27 Feb 2013 06:26:28 +0000 (06:26 +0000)]
am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
68719a176eacf86d19813a38f59041f3b209693d':
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: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
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: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 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: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: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:11:46 +0000 (19:11 +0000)]
Merge "Zygote: address comments from previous review."
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: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: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: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
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: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 [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: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 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 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
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
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
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."
Elliott Hughes [Sat, 22 Dec 2012 00:27:19 +0000 (16:27 -0800)]
am
2e5f16bf: Merge "Fix a forecopy/forcecopy typo."
* commit '
2e5f16bfe83e26f3a7958d57df8a2a2e87f241c5':
Fix a forecopy/forcecopy typo.