OSDN Git Service
Elliott Hughes [Tue, 16 Oct 2012 03:25:54 +0000 (20:25 -0700)]
am
d7233190: am
20b6e422: Merge "Remove Jumbo opcode support"
* commit '
d72331907d6c328512e969ba68dac1ea72beee41':
Remove Jumbo opcode support
Elliott Hughes [Tue, 16 Oct 2012 03:20:51 +0000 (20:20 -0700)]
am
20b6e422: Merge "Remove Jumbo opcode support"
* commit '
20b6e422412a2d004e3a92e5bfbba77d3de5e6c3':
Remove Jumbo opcode support
jeffhao [Tue, 16 Oct 2012 01:31:38 +0000 (18:31 -0700)]
Merge "Add dx option to always generate const-string/jumbo."
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo.
This allows large dex files with many strings to be merged properly.
Change-Id: I2c32b03ddb42735d16bc6155c1a1096159fb15ed
Elliott Hughes [Tue, 16 Oct 2012 00:36:47 +0000 (17:36 -0700)]
Merge "Remove Jumbo opcode support"
Elliott Hughes [Mon, 15 Oct 2012 22:58:41 +0000 (15:58 -0700)]
am
48aa13d7: am
0a2bb853: am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
48aa13d722b0c9831fe01fb4d25e96eab3043498':
Revert the fix for incorrect package-private overriding.
Elliott Hughes [Mon, 15 Oct 2012 22:55:52 +0000 (15:55 -0700)]
am
0a2bb853: am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
0a2bb8537b3dbb4ef7ff03b64499ec6a14cdaf46':
Revert the fix for incorrect package-private overriding.
Elliott Hughes [Mon, 15 Oct 2012 22:52:55 +0000 (15:52 -0700)]
am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
9735865121118f255c4c15183b236f9f30e795f1':
Revert the fix for incorrect package-private overriding.
Raghu Gandham [Mon, 15 Oct 2012 22:29:11 +0000 (15:29 -0700)]
Remove Jumbo opcode support
Change-Id: If112b0f44cb6ea064fe8038f10bb00a0cf11c124
Elliott Hughes [Mon, 15 Oct 2012 21:29:23 +0000 (14:29 -0700)]
Revert the fix for incorrect package-private overriding.
This fixes FIFA 2012, the download portion of which relies on the
old bug, without breaking instrumentation tests. The problem is that
dexopt tries to quicken method calls, and gets confused by this case
where the apparent static method resolution differs from the actual
one at runtime, depending on the targetSdkVersion of the specific app.
dexopt can't make an ahead-of-time decision in a world where the rules
might change at runtime.
Bug:
7301030
Bug:
7343420
Change-Id: Iaa15611f099546b7e54279cfd6abc9b4cdcb9812
The Android Open Source Project [Mon, 15 Oct 2012 14:40:22 +0000 (07:40 -0700)]
am
34b45f88: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
34b45f88a3eedd23a1b369138c8e376edb6f8168':
The Android Open Source Project [Mon, 15 Oct 2012 14:37:59 +0000 (07:37 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Id403e6fb16b6b14191481f00bf0166913a54ba35
The Android Automerger [Sat, 13 Oct 2012 10:49:58 +0000 (03:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sat, 13 Oct 2012 00:56:19 +0000 (17:56 -0700)]
am
ae81ca40: am
e3c42563: am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
ae81ca4088e5b2b696820828f9e785ca55dc1d8e':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:55:04 +0000 (17:55 -0700)]
am
e3c42563: am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
e3c425633daeb0e3cba9b040ccc2805bea3c4a8b':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:53:25 +0000 (17:53 -0700)]
am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
ed94ff793680873d2c942641ccda9ea81c95b5ad':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:47:06 +0000 (17:47 -0700)]
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
This reverts commit
0fe885202fc2d1e7f3d34c99ae3487a9a6387be1
May be causing http://b/
7343420, though I can't reproduce that crash.
Change-Id: Ia3d2a1507602d07699d1f9914e734cc813f97518
The Android Automerger [Fri, 12 Oct 2012 23:34:27 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 12 Oct 2012 18:51:57 +0000 (11:51 -0700)]
am
248f40a6: am
0e81b3ef: Merge "Remove (one last?) __sh__."
* commit '
248f40a691f7b55baffe4c1f0be060765991936b':
Remove (one last?) __sh__.
Elliott Hughes [Fri, 12 Oct 2012 18:50:16 +0000 (11:50 -0700)]
am
0e81b3ef: Merge "Remove (one last?) __sh__."
* commit '
0e81b3eff8c7654c489011ffd9fa31ab4fed0f44':
Remove (one last?) __sh__.
The Android Automerger [Fri, 12 Oct 2012 18:49:48 +0000 (11:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 12 Oct 2012 18:43:53 +0000 (11:43 -0700)]
Merge "Remove (one last?) __sh__."
Elliott Hughes [Fri, 12 Oct 2012 18:17:34 +0000 (11:17 -0700)]
am
bca7721c: am
f1780867: am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
bca7721c678858af6007939cfd061a9af2d3cf42':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 18:13:19 +0000 (11:13 -0700)]
Remove (one last?) __sh__.
Zombies everywhere! I think this is the last one that isn't in third-party
code, though I'm pretty sure I've said that before.
Change-Id: I07c88a07c694eea646bee85c5e9ad3004b3a03e1
Elliott Hughes [Fri, 12 Oct 2012 18:10:31 +0000 (11:10 -0700)]
am
f1780867: am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
f17808671a905e184d600f80a0657bf2640b14ab':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 17:30:03 +0000 (10:30 -0700)]
am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
0fe885202fc2d1e7f3d34c99ae3487a9a6387be1':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 01:17:50 +0000 (18:17 -0700)]
Don't enforce access checks for overloading for targetSdkVersion < 17.
Still warn, and enforce the missing check for targetSdkVersion >= 17.
Bug:
7301030
Change-Id: I8189fcbf222f331b1f80a156b01082d61f1f9362
The Android Open Source Project [Wed, 10 Oct 2012 16:45:46 +0000 (09:45 -0700)]
am
6bfe5155: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
6bfe51550a6d31fa12bbfcf29190151457b901ba':
The Android Open Source Project [Wed, 10 Oct 2012 16:43:58 +0000 (09:43 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibd02b2d1bdb7511eb777e72afd2d62b7327dca96
The Android Automerger [Wed, 10 Oct 2012 15:43:19 +0000 (08:43 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 10 Oct 2012 02:37:16 +0000 (19:37 -0700)]
am
0e12aa4f: am
29c00997: am
9c789541: Don\'t disable inlining for ARM.
* commit '
0e12aa4f236780795b03c737114c338237c0a83a':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:35:08 +0000 (19:35 -0700)]
am
29c00997: am
9c789541: Don\'t disable inlining for ARM.
* commit '
29c00997c5ac9becbebb0337affe9e5b5ef27da1':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:33:19 +0000 (19:33 -0700)]
am
7519654e: am
0138866d: Merge "Don\'t disable inlining for ARM."
* commit '
7519654e8bdfd1a19c1a60be175f49d141ed1770':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:32:53 +0000 (19:32 -0700)]
am
9c789541: Don\'t disable inlining for ARM.
* commit '
9c789541c5a37dc8c5d12d98b8db74def61e26db':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:31:40 +0000 (19:31 -0700)]
am
0138866d: Merge "Don\'t disable inlining for ARM."
* commit '
0138866d22a58269602a45adf30d69ec55910b43':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:20:03 +0000 (19:20 -0700)]
Merge "Don't disable inlining for ARM."
Elliott Hughes [Wed, 10 Oct 2012 01:07:14 +0000 (18:07 -0700)]
Don't disable inlining for ARM.
I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.
(cherry-pick of
4b3f78e73109604b817294a9c21bc3653328e3fb.)
Bug:
7179010
Change-Id: I627badb448a056ed4a1cc1e75a05325ce6112876
Elliott Hughes [Wed, 10 Oct 2012 01:07:14 +0000 (18:07 -0700)]
Don't disable inlining for ARM.
I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.
Bug:
7179010
Change-Id: If0de856b93615f01dfc5e8977d5c97f550cec15f
The Android Open Source Project [Tue, 9 Oct 2012 14:31:41 +0000 (07:31 -0700)]
am
3b43dbce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3b43dbce7c80b7b72bb3851cda955af9627d054f':
The Android Open Source Project [Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ied76c774dce525f9e1ed5c59be92c7cd5bbd9059
The Android Automerger [Tue, 9 Oct 2012 13:59:11 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 8 Oct 2012 19:17:16 +0000 (12:17 -0700)]
am
e807903b: am
525d731d: am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
e807903b6e05ecfe1418e8694caef076e7136f8a':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:15:41 +0000 (12:15 -0700)]
am
525d731d: am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
525d731dcc2d4629681fbc6f8e37f2e3bda4a6ac':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:14:19 +0000 (12:14 -0700)]
am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
43e44fd5952d0bbad335c54d1f5c3eac920d755b':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:12:13 +0000 (12:12 -0700)]
Merge "Log if dlopen(3) fails." into jb-mr1-dev
Elliott Hughes [Sat, 6 Oct 2012 01:14:39 +0000 (18:14 -0700)]
am
70799856: am
37268179: am
0dc107c0: Merge "MIPS: Missing zero-checks in JIT compiler."
* commit '
707998566a9814fb2dbb892874711a708915f213':
MIPS: Missing zero-checks in JIT compiler.
Elliott Hughes [Sat, 6 Oct 2012 01:12:32 +0000 (18:12 -0700)]
am
37268179: am
0dc107c0: Merge "MIPS: Missing zero-checks in JIT compiler."
* commit '
3726817959d2bd8bea87726338c05464f7f29e3b':
MIPS: Missing zero-checks in JIT compiler.
Elliott Hughes [Sat, 6 Oct 2012 01:10:21 +0000 (18:10 -0700)]
am
0dc107c0: Merge "MIPS: Missing zero-checks in JIT compiler."
* commit '
0dc107c059738fd954d07108f0bbf5e9982d563a':
MIPS: Missing zero-checks in JIT compiler.
Elliott Hughes [Sat, 6 Oct 2012 01:01:13 +0000 (18:01 -0700)]
Merge "MIPS: Missing zero-checks in JIT compiler."
Douglas Leung [Sat, 6 Oct 2012 00:01:22 +0000 (17:01 -0700)]
MIPS: Missing zero-checks in JIT compiler.
Zero-checks were not generated by the JIT compiler for
some instructions. This caused crashes instead of
the expected ArithmeticException.
Change-Id: Ic7f20c78ef9ac22bb529b6ed9a38f0ffb2fab33c
Signed-off-by: Douglas Leung <douglas@mips.com>
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:25:46 +0000 (15:25 -0700)]
am
8b9abc4d: (-s ours) am
26a4777e: (-s ours) Reconcile with jb-dev - do not merge
* commit '
8b9abc4d7f3ed13319003d13c4b2161a36e4ac0f':
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:23:36 +0000 (15:23 -0700)]
am
26a4777e: (-s ours) Reconcile with jb-dev - do not merge
* commit '
26a4777e884b78a2133762bc2095eaa7b9583054':
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:21:32 +0000 (15:21 -0700)]
Reconcile with jb-dev - do not merge
Change-Id: Id493d6f47e331b0aade672a98ce14251eb721121
The Android Open Source Project [Tue, 2 Oct 2012 16:19:07 +0000 (09:19 -0700)]
am
c27239cf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c27239cfea8d2b1057d940af5180073c77ebfc0c':
The Android Open Source Project [Tue, 2 Oct 2012 16:16:54 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5d4d6765bba6a3a0ba8a3007098bc53e5c455139
Jeff Sharkey [Mon, 1 Oct 2012 20:46:22 +0000 (13:46 -0700)]
am
d99c1f6b: am
42e89067: am
2e3748ed: Final shuffle to make /sdcard work in shell.
* commit '
d99c1f6b7eccdc30e316065eda1bf9f40508e0c8':
Final shuffle to make /sdcard work in shell.
Jeff Sharkey [Mon, 1 Oct 2012 17:15:42 +0000 (10:15 -0700)]
am
42e89067: am
2e3748ed: Final shuffle to make /sdcard work in shell.
* commit '
42e8906761b3c0e07799aae72d90516cd27002a2':
Final shuffle to make /sdcard work in shell.
The Android Automerger [Mon, 1 Oct 2012 01:17:26 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Sun, 30 Sep 2012 20:23:29 +0000 (13:23 -0700)]
am
2e3748ed: Final shuffle to make /sdcard work in shell.
* commit '
2e3748ed8161e710d1a4d9f8070e16ce3350209a':
Final shuffle to make /sdcard work in shell.
Jeff Sharkey [Sun, 30 Sep 2012 19:46:06 +0000 (12:46 -0700)]
Final shuffle to make /sdcard work in shell.
Always prepare legacy path, since it's no longer created by init.
Bug:
7255202
Change-Id: I152b44ac62f69923b300abc8d394afe79dac4601
Jean-Baptiste Queru [Fri, 28 Sep 2012 22:52:05 +0000 (15:52 -0700)]
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:18:15 +0000 (14:18 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I1483d6b8ea36ce97587978cdcd4558ce8835f981
Nick Kralevich [Thu, 27 Sep 2012 15:45:40 +0000 (08:45 -0700)]
Merge "Disable ADDR_NO_RANDOMIZE for 3.4 or greater kernels"
Elliott Hughes [Thu, 27 Sep 2012 00:35:29 +0000 (17:35 -0700)]
am
3c2e75f5: am
589cc576: am
f75aa0de: Merge "Log if dlopen(3) fails."
* commit '
3c2e75f598ad29340d29625dbdb111b458ad227e':
Log if dlopen(3) fails.
Elliott Hughes [Thu, 27 Sep 2012 00:32:01 +0000 (17:32 -0700)]
am
589cc576: am
f75aa0de: Merge "Log if dlopen(3) fails."
* commit '
589cc5762de40679fa739f5913a3f7f4367cca7e':
Log if dlopen(3) fails.
Elliott Hughes [Thu, 27 Sep 2012 00:30:19 +0000 (17:30 -0700)]
am
f75aa0de: Merge "Log if dlopen(3) fails."
* commit '
f75aa0de3d243466f56d262de08da3808ad34cf3':
Log if dlopen(3) fails.
Elliott Hughes [Thu, 27 Sep 2012 00:12:26 +0000 (17:12 -0700)]
Merge "Log if dlopen(3) fails."
Elliott Hughes [Wed, 26 Sep 2012 23:40:41 +0000 (16:40 -0700)]
Log if dlopen(3) fails.
It turns out that some apps swallow the UnsatisfiedLinkError, making it
really hard to work out why they failed to launch.
Before:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
After:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
E dalvikvm: dlopen("/data/app-lib/com.adobe.air-1/libCore.so") failed: Cannot load library: soinfo_relocate(linker.cpp:975): cannot locate symbol "_ZN7android10VectorImpl19reservedVectorImpl1Ev" referenced by "libCore.so"...
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
(cherry-pick of
6567510ba1470bba6036d2b0b042425bdd03cf2b.)
Bug:
7093208
Change-Id: I4dcdff2ffe49a4897d8f5279d09a0dcc3de70db6
Nick Kralevich [Wed, 26 Sep 2012 23:53:31 +0000 (16:53 -0700)]
Disable ADDR_NO_RANDOMIZE for 3.4 or greater kernels
Early kernels had memory fragmentation bugs on ARM when
ASLR was enabled. The ADDR_NO_RANDOMIZE flag was added
to work around this bug until the appropriate kernel fix
could be made.
Linux kernel 3.4 seems to have this fix, making this workaround
unnecessary. Remove the workaround if we detect we're running
an up-to-date kernel.
(I believe the kernel patch is also in 3.3, but haven't explicitly
tested it).
Bug:
5817320
Change-Id: Ifcbc68fdfb2ada0f55358e7a7af9e155fe3bec4f
Elliott Hughes [Wed, 26 Sep 2012 23:40:41 +0000 (16:40 -0700)]
Log if dlopen(3) fails.
It turns out that some apps swallow the UnsatisfiedLinkError, making it
really hard to work out why they failed to launch.
Before:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
After:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
E dalvikvm: dlopen("/data/app-lib/com.adobe.air-1/libCore.so") failed: Cannot load library: soinfo_relocate(linker.cpp:975): cannot locate symbol "_ZN7android10VectorImpl19reservedVectorImpl1Ev" referenced by "libCore.so"...
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
Bug:
7093208
Change-Id: Ib751fb959d49cb872d586f299e62ed6aae783de9
The Android Open Source Project [Wed, 26 Sep 2012 17:08:10 +0000 (10:08 -0700)]
am
917e4626: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
917e46263524a79c3b3da93a8c82282f8ba98ce6':
The Android Open Source Project [Wed, 26 Sep 2012 16:06:04 +0000 (09:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I96d2704e9f9c0e3af3a0553a3e856aaa0d72bf1c
The Android Automerger [Wed, 26 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Tue, 25 Sep 2012 20:30:17 +0000 (13:30 -0700)]
am
a141dacf: am
9d9919e9: Merge "Allow max free size of heap to be configured." into jb-mr1-dev
* commit '
a141dacf6204d5eab2633c9f1b4eb77f28bff251':
Allow max free size of heap to be configured.
Ian Rogers [Tue, 25 Sep 2012 19:50:17 +0000 (12:50 -0700)]
am
9d9919e9: Merge "Allow max free size of heap to be configured." into jb-mr1-dev
* commit '
9d9919e93c3af16888cf90c475fff63758d73770':
Allow max free size of heap to be configured.
Ian Rogers [Tue, 25 Sep 2012 19:32:13 +0000 (12:32 -0700)]
am
9d9919e9: Merge "Allow max free size of heap to be configured." into jb-mr1-dev
* commit '
9d9919e93c3af16888cf90c475fff63758d73770':
Allow max free size of heap to be configured.
Ian Rogers [Tue, 25 Sep 2012 18:34:18 +0000 (11:34 -0700)]
Merge "Allow max free size of heap to be configured." into jb-mr1-dev
The Android Automerger [Tue, 25 Sep 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Sun, 23 Sep 2012 23:33:32 +0000 (16:33 -0700)]
Allow max free size of heap to be configured.
This allows the max free to be larger on devices with more memory and
thereby avoid GCs (that may be more frequent due to larger bitmaps).
b/
6606849
Change-Id: I4063a303ea4be3c1f227259d699fb238a806451f
Jeff Sharkey [Tue, 25 Sep 2012 00:51:25 +0000 (17:51 -0700)]
am
5718295a: am
5005743f: Move multi-user OBB under user-specific path.
* commit '
5718295ac30c252ad80a24530e6b03153d701252':
Move multi-user OBB under user-specific path.
Jeff Sharkey [Tue, 25 Sep 2012 00:44:40 +0000 (17:44 -0700)]
am
5005743f: Move multi-user OBB under user-specific path.
* commit '
5005743f9b35effed87bbd9a9786f1f2e16bebe2':
Move multi-user OBB under user-specific path.
Jeff Sharkey [Tue, 25 Sep 2012 00:44:25 +0000 (17:44 -0700)]
am
5005743f: Move multi-user OBB under user-specific path.
* commit '
5005743f9b35effed87bbd9a9786f1f2e16bebe2':
Move multi-user OBB under user-specific path.
Jeff Sharkey [Mon, 24 Sep 2012 21:10:02 +0000 (14:10 -0700)]
Move multi-user OBB under user-specific path.
Support apps that may manually build OBB paths using
getExternalStorageDirectory() by making multi-user OBB paths live
under user-specific path.
This new structure means we can simplify the emulated_legacy paths
to be a single recursive bind mount.
Bug:
7212801
Change-Id: I85a0caebca52a6ff3bfe61c961518a91f0b8f8ff
Jean-Baptiste Queru [Mon, 24 Sep 2012 07:49:03 +0000 (00:49 -0700)]
am
7b11bae8: am
74573701: am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
7b11bae8d51871d62e0c26ca2e5db57dba46743b':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Sat, 22 Sep 2012 00:47:51 +0000 (17:47 -0700)]
am
74573701: am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
74573701ee9863a0d2f1ba638b1c1cce69cdc2b2':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:20:45 +0000 (13:20 -0700)]
am
74573701: am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
74573701ee9863a0d2f1ba638b1c1cce69cdc2b2':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:19:04 +0000 (13:19 -0700)]
am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
9bd5a9db106863069dd6c12de881acca6103f8d7':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:15:15 +0000 (13:15 -0700)]
Reconcile jb-dev and AOSP
Change-Id: If3d2ce0f23b929f92d49649e015386670ed16863
Elliott Hughes [Fri, 21 Sep 2012 18:04:56 +0000 (11:04 -0700)]
am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
067c62027dc592224e1ae16f9847b7273d3e4026':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 20:07:59 +0000 (13:07 -0700)]
am
08f077ee: am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
08f077ee1905ea0861717c34205a463eaa1cd76a':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 20:01:34 +0000 (13:01 -0700)]
am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
067c62027dc592224e1ae16f9847b7273d3e4026':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 19:58:45 +0000 (12:58 -0700)]
am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
74d4652ebd432295a5442b024f51bce531abea15':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 19:53:14 +0000 (12:53 -0700)]
am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
e64cfc1cdacd8a820acce596f6986e17e2f5e330':
Log when the native trace is unavailable
The Android Open Source Project [Thu, 20 Sep 2012 19:52:41 +0000 (12:52 -0700)]
am
50e62906: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
50e6290628264678012d2b21b7edd10f574e26dc':
Elliott Hughes [Thu, 20 Sep 2012 19:49:45 +0000 (12:49 -0700)]
am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
b79d90ebd197b9040c06d73f5dc8bbc8fdad1d54':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 18:34:32 +0000 (11:34 -0700)]
Merge "Log when the native trace is unavailable"
Andy McFadden [Wed, 19 Sep 2012 00:50:59 +0000 (17:50 -0700)]
Log when the native trace is unavailable
This should allow us to differentiate between "couldn't get the
stack" and "didn't try to get the stack". Also show the thread's
state (e.g. 'R' for running, 'D' for uninterruptible syscall).
Bug
7053953
(cherry-pick of
b3667a19f5c573b7785876979af4781292d27327.)
Change-Id: I0a40cb3d3cdd9aef8589a39586cccd9c229aa8cb
The Android Open Source Project [Thu, 20 Sep 2012 17:35:05 +0000 (10:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I70fc7419598ce4c0f9aba005b8ade9d4f6682d2a
The Android Automerger [Thu, 20 Sep 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
OSDN Git Service
