OSDN Git Service
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: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 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
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: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
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
Yohann Roussel [Mon, 12 Nov 2012 20:13:55 +0000 (12:13 -0800)]
am
a3df5b58: am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
a3df5b58369667f2fb3c4616f7e175b6ec7db412':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:13:54 +0000 (12:13 -0800)]
am
ce0723cc: am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
ce0723cc425223c0e93ab0ce1968822c5ef9d352':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:10:29 +0000 (12:10 -0800)]
am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
b6f4e0372154191bdf1ee32727aead1fe1200cbc':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:10:28 +0000 (12:10 -0800)]
am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
437f58a5d25d76aa035c53e341e2516e39a70927':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)]
am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
afe3a0131e75367759e1d7a69cec0aac2a45524c':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)]
am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080':
Fix alignment when recompacting a DexMerger result. do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:37:02 +0000 (07:37 -0800)]
am
bb077798: Reconcile with jb-mr1-release - do not merge
* commit '
bb07779818b583ec6d0b73c4062f485751332c81':
The Android Open Source Project [Mon, 12 Nov 2012 15:35:23 +0000 (07:35 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic0fb72b0939908c2e072e4ae5d60c9d24de9dc66
The Android Open Source Project [Mon, 12 Nov 2012 15:33:04 +0000 (07:33 -0800)]
am
890e41c1: Merge
f870f2d - do not merge
* commit '
890e41c1c4289b97476bc90d2e1e443fffec4b13':
Add dx option to always generate const-string/jumbo.do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:29:38 +0000 (07:29 -0800)]
Merge
f870f2d - do not merge
Change-Id: Ib8ea0f0d579f78fcab1deca05ff1beac9ba9bc03
The Android Automerger [Sat, 10 Nov 2012 00:25:17 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo.do not merge.
This allows large dex files with many strings to be merged properly.
(cherry picked from commit
266f45ff7da18022faf5f77df76c69f8cdad313f)
Change-Id: I5fe4c55d84a91101a4f89f590117aa6dc0bfc0f2
Yohann Roussel [Wed, 7 Nov 2012 20:13:16 +0000 (12:13 -0800)]
am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
288f22800c8fe1eb44afff78ec1fff815379183e':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
Yohann Roussel [Wed, 7 Nov 2012 10:03:30 +0000 (02:03 -0800)]
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
This reverts commit
707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6
Looks like jb-dev is missing some other patches before it possible to cherry-pick this one.
Change-Id: I8cbdd649d03696cb80be0dacc8640275468ef162
yroussel [Wed, 7 Nov 2012 03:16:39 +0000 (19:16 -0800)]
am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6':
Fix alignment when recompacting a DexMerger result. do not merge.
yroussel [Wed, 31 Oct 2012 15:25:42 +0000 (16:25 +0100)]
Fix alignment when recompacting a DexMerger result. do not merge.
(cherry picked from commit
e0e7b076e427a327e27247aa409d0b0fa8b0e0aa)
Change-Id: Ib8092bd9ce9ba5490040a41c5d604e6a138acc7d
The Android Open Source Project [Tue, 6 Nov 2012 19:22:55 +0000 (11:22 -0800)]
am
e7e77c4b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
e7e77c4bd64c87798344d690e13418b481ab2d05':
Revert the fix for incorrect package-private overriding.
One more errno for encrypted devices.
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Ensure we fence the writing of clazz to an Object post allocation."
The Android Open Source Project [Tue, 6 Nov 2012 19:20:15 +0000 (11:20 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia24bfd680910be16fa6f89fbd48db251b076d8f6
jeffhao [Mon, 29 Oct 2012 20:42:09 +0000 (13:42 -0700)]
am
d454d96b: am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
d454d96bf19438d2fc4301714abf55f7fecd0001':
jeffhao [Mon, 29 Oct 2012 20:42:08 +0000 (13:42 -0700)]
am
07df9514: am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
07df951456410a66353455108d86958985a15115':
The Android Automerger [Fri, 26 Oct 2012 23:22:35 +0000 (16:22 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jeffhao [Wed, 17 Oct 2012 18:10:42 +0000 (11:10 -0700)]
am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
a0475a59b58c39c9a3babddc371815c6d51e3f39':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 18:08:33 +0000 (11:08 -0700)]
am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:56:37 +0000 (10:56 -0700)]
am
a0475a59: am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
a0475a59b58c39c9a3babddc371815c6d51e3f39':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:53:43 +0000 (10:53 -0700)]
am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
d5cc36801bb86ba4e8b3db6efc67282f41b5b784':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:50:43 +0000 (10:50 -0700)]
am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
9db54b1e21b8e994658890328e57caa822e444a7':
Add dx option to always generate const-string/jumbo. do not merge.
The Android Automerger [Wed, 17 Oct 2012 13:59:13 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jeffhao [Wed, 17 Oct 2012 01:54:58 +0000 (18:54 -0700)]
am
69dd411c: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo. do not merge.
This allows large dex files with many strings to be merged properly.
(cherry picked from commit
266f45ff7da18022faf5f77df76c69f8cdad313f)
Change-Id: I0277b1a0a81b3a77092a9e9f8f648ff190e29723
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo. do not merge.
This allows large dex files with many strings to be merged properly.
(cherry picked from commit
266f45ff7da18022faf5f77df76c69f8cdad313f)
Change-Id: I5e85346610c4c5280ecdd9e97c63eaef4420642e
The Android Automerger [Tue, 16 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
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.
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 Automerger [Mon, 15 Oct 2012 19:30:39 +0000 (12:30 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
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: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
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 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 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: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 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
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: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
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
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 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 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 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: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 [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 [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: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 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
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 Automerger [Thu, 20 Sep 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andy McFadden [Thu, 20 Sep 2012 13:19:19 +0000 (06:19 -0700)]
am
b3667a19: Log when the native trace is unavailable
* commit '
b3667a19f5c573b7785876979af4781292d27327':
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
Change-Id: Ibc9e6a6f0fc855a4e5e8e133122232dc939bcb16
The Android Automerger [Tue, 18 Sep 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 17 Sep 2012 22:57:41 +0000 (15:57 -0700)]
am
86913b6b: am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
86913b6b88b9ad4a1eea14be928da6c9485d53c0':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:54:47 +0000 (15:54 -0700)]
am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
90f12e0b4b08b9776b02580b223ec8968a5725b0':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:52:48 +0000 (15:52 -0700)]
am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
4535e29e384a400a62fe259674565c0e21c4c182':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:50:19 +0000 (15:50 -0700)]
am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
a177aa50c665e97f92ee7519ed9d32b0e89e84d3':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:47:11 +0000 (15:47 -0700)]
Merge "Use 0xde as the poison value after JIT code cache reset."
Ben Cheng [Mon, 17 Sep 2012 19:17:59 +0000 (12:17 -0700)]
Use 0xde as the poison value after JIT code cache reset.
(cherry-pick of
60497bbcee68d98b2bdcb3fb64682b00d61b942d.)
Change-Id: I4f8c1bac2ac3bdc1d931e91f3e2e8038fe4c2b5a
Ben Cheng [Mon, 17 Sep 2012 19:25:20 +0000 (12:25 -0700)]
am
ae341c38: Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
* commit '
ae341c385bd23d73212e07e8e1c8bb5092c0e585':
Use 0xde as the poison value after JIT code cache reset.
Ben Cheng [Mon, 17 Sep 2012 19:22:40 +0000 (12:22 -0700)]
Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
Ben Cheng [Mon, 17 Sep 2012 19:17:59 +0000 (12:17 -0700)]
Use 0xde as the poison value after JIT code cache reset.
Change-Id: Ic25ede5bcd988f240d8c24df6bc5da81e2b03249
The Android Automerger [Sun, 16 Sep 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 14 Sep 2012 21:14:03 +0000 (14:14 -0700)]
am
dde72bb4: am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
dde72bb4edd23a319c02be9fcb3ee79757b26869':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:11:53 +0000 (14:11 -0700)]
am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
8e80f76abdeedb75ca0837545f6c33c2c452a928':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:10:03 +0000 (14:10 -0700)]
am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
d207be351aa5f8707a7829fc5cfd602b69b5bcc5':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:08:24 +0000 (14:08 -0700)]
am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
f31a0600bb84e04280440c84a5966a624a89e117':
Optimize those StrictMath routines that are identical to Math routines.