OSDN Git Service
Udayan Banerji [Mon, 1 Apr 2013 20:35:52 +0000 (13:35 -0700)]
am
3d80060d: am
cc76e3ff: [x86] Disable Method-JIT for x86 target
* commit '
3d80060d70e50e9b3b3e559f2c9cdc162680daf8':
[x86] Disable Method-JIT for x86 target
Udayan Banerji [Mon, 1 Apr 2013 20:33:35 +0000 (13:33 -0700)]
am
cc76e3ff: [x86] Disable Method-JIT for x86 target
* commit '
cc76e3ff10f5b1fc5b196e531d5a4e108df87913':
[x86] Disable Method-JIT for x86 target
Udayan Banerji [Fri, 29 Mar 2013 17:52:32 +0000 (10:52 -0700)]
[x86] Disable Method-JIT for x86 target
Disable Method JIT when compiling for x86 target.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
8d8a7958a7aa0c73273161ddacfad34d1b9a97fe)
Change-Id: Ic0a809dc4f80e74db445b20f252d8c9707420588
Elliott Hughes [Mon, 1 Apr 2013 20:22:41 +0000 (13:22 -0700)]
am
35aa6a6b: am
ddff71d4: Merge "[x86] Disable Method-JIT for x86 target"
* commit '
35aa6a6bb1cd3871c3b6c32c9f4cce56e33112ee':
[x86] Disable Method-JIT for x86 target
Elliott Hughes [Mon, 1 Apr 2013 20:20:48 +0000 (13:20 -0700)]
am
ddff71d4: Merge "[x86] Disable Method-JIT for x86 target"
* commit '
ddff71d449765984d1cae6b6e8191fa9956d135b':
[x86] Disable Method-JIT for x86 target
Elliott Hughes [Mon, 1 Apr 2013 20:08:46 +0000 (20:08 +0000)]
Merge "[x86] Disable Method-JIT for x86 target"
Elliott Hughes [Sat, 30 Mar 2013 01:09:43 +0000 (18:09 -0700)]
am
870318c5: am
cbe8d43e: Fix a cast in JniEnv::NewDirectByteBuffer.
* commit '
870318c59b17d132c74c9dd503f3bd15562c80c6':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 01:09:42 +0000 (18:09 -0700)]
am
a741ad6d: am
30165bdf: Track libcore\'s DirectByteBuffer <init> change.
* commit '
a741ad6dbf8af55271538dea51851bc77caba968':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 01:08:06 +0000 (18:08 -0700)]
am
cbe8d43e: Fix a cast in JniEnv::NewDirectByteBuffer.
* commit '
cbe8d43ea02e7885504a90461283d2bd8456aaa6':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 01:04:38 +0000 (18:04 -0700)]
am
30165bdf: Track libcore\'s DirectByteBuffer <init> change.
* commit '
30165bdf59a0395c6b87ce58fc60e4586a92d147':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:27:28 +0000 (17:27 -0700)]
Fix a cast in JniEnv::NewDirectByteBuffer.
(cherry picked from commit
1abc689a32fc20b38227060e4da5e0934df8fc19)
Change-Id: I89c8544d77721aaa5ae192087e8873d3d64d5f3b
Elliott Hughes [Sat, 30 Mar 2013 01:02:40 +0000 (18:02 -0700)]
am
fdfb24a4: am
497385d4: Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
* commit '
fdfb24a474850329adce2308041301a607c9d685':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 00:19:31 +0000 (17:19 -0700)]
Track libcore's DirectByteBuffer <init> change.
See
9ce6a2533b50ffcd24b8b10bae7f234042768819.
(cherry picked from commit
e5d14162ff278c41e09c42769cc31401feeeba18)
Change-Id: I41be5581fd6f6c68243194d79c45450eeba86333
Elliott Hughes [Sat, 30 Mar 2013 00:59:22 +0000 (17:59 -0700)]
am
497385d4: Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
* commit '
497385d4994ce49b8ef1efa3de6efb03afd333b9':
Fix a cast in JniEnv::NewDirectByteBuffer.
Elliott Hughes [Sat, 30 Mar 2013 00:58:47 +0000 (17:58 -0700)]
am
a34ad1c6: am
2a213ecf: Merge "Track libcore\'s DirectByteBuffer <init> change."
* commit '
a34ad1c6aa7c8bf9670c7565d9fa27d2d5614483':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:58:39 +0000 (17:58 -0700)]
am
69448f17: am
91b8b139: Extra log information when pthread_create fails.
* commit '
69448f178cf6834a2b80cf4fed15701e92b08b5b':
Extra log information when pthread_create fails.
Elliott Hughes [Sat, 30 Mar 2013 00:42:17 +0000 (00:42 +0000)]
Merge "Fix a cast in JniEnv::NewDirectByteBuffer."
Elliott Hughes [Sat, 30 Mar 2013 00:28:07 +0000 (17:28 -0700)]
am
2a213ecf: Merge "Track libcore\'s DirectByteBuffer <init> change."
* commit '
2a213ecf8c8d619f325e3576199142c61b8551b3':
Track libcore's DirectByteBuffer <init> change.
Elliott Hughes [Sat, 30 Mar 2013 00:27:28 +0000 (17:27 -0700)]
Fix a cast in JniEnv::NewDirectByteBuffer.
Change-Id: I8692b31c6ce64efc68124df02117b6e4529dfe98
Elliott Hughes [Sat, 30 Mar 2013 00:20:29 +0000 (00:20 +0000)]
Merge "Track libcore's DirectByteBuffer <init> change."
Elliott Hughes [Sat, 30 Mar 2013 00:19:31 +0000 (17:19 -0700)]
Track libcore's DirectByteBuffer <init> change.
See
9ce6a2533b50ffcd24b8b10bae7f234042768819.
Change-Id: Ie736e69a3fa7bdf55709d8e2960761202a20e820
Elliott Hughes [Sat, 30 Mar 2013 00:06:12 +0000 (17:06 -0700)]
am
91b8b139: Extra log information when pthread_create fails.
* commit '
91b8b139893877cca509f35afa0075713d2ff7f3':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:37:25 +0000 (16:37 -0700)]
Extra log information when pthread_create fails.
Bug:
8470684
(cherry picked from commit
3eeda5e6fe172758e47d237694daf4f9421f3c12)
Change-Id: Ideba410d393b69753bbfae7558a2692edd08d339
Elliott Hughes [Fri, 29 Mar 2013 23:58:02 +0000 (16:58 -0700)]
am
7450fa7b: am
1fb2fed5: Merge "Extra log information when pthread_create fails."
* commit '
7450fa7b9234a3e4f902fe58abbf91b9e39adc87':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:53:02 +0000 (16:53 -0700)]
am
1fb2fed5: Merge "Extra log information when pthread_create fails."
* commit '
1fb2fed51f7d7376fb067a0fc32ae8d3eade843a':
Extra log information when pthread_create fails.
Elliott Hughes [Fri, 29 Mar 2013 23:47:53 +0000 (23:47 +0000)]
Merge "Extra log information when pthread_create fails."
Elliott Hughes [Fri, 29 Mar 2013 23:37:25 +0000 (16:37 -0700)]
Extra log information when pthread_create fails.
Bug:
8470684
Change-Id: I24d22d5ec4181614d173a582773540c8f712ab18
Elliott Hughes [Fri, 29 Mar 2013 21:35:05 +0000 (14:35 -0700)]
am
afc61c6f: am
4d5b4344: am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
afc61c6fac3b855236fce1b062e1e2facdea641f':
Track 64-bit nio changes.
Udayan Banerji [Fri, 29 Mar 2013 17:52:32 +0000 (10:52 -0700)]
[x86] Disable Method-JIT for x86 target
Disable Method JIT when compiling for x86 target.
Change-Id: Ide0dbd1f602ffd955b901cc152de1e05771fd529
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
Elliott Hughes [Fri, 29 Mar 2013 17:26:17 +0000 (10:26 -0700)]
am
4d5b4344: am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
4d5b4344904b099ea60b770df61d4e19bf23ecf1':
Track 64-bit nio changes.
Elliott Hughes [Fri, 29 Mar 2013 17:21:56 +0000 (10:21 -0700)]
am
84975d53: am
9813216f: Merge "Track 64-bit nio changes."
* commit '
84975d535edf98e911caf2a1bca1e7810aa03ccb':
Track 64-bit nio changes.
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
The Android Open Source Project [Fri, 29 Mar 2013 16:50:36 +0000 (09:50 -0700)]
am
a5bf9b6d: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a5bf9b6d355a6a82fc9f00959c744cf32c936953':
The Android Open Source Project [Fri, 29 Mar 2013 16:48:37 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I8e1546cee7e24bc1407c8b022d29d463a661839a
Elliott Hughes [Thu, 28 Mar 2013 15:47:33 +0000 (08:47 -0700)]
am
fd21b120: am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
fd21b120062976f20450ac3cf80f980b54c59e00':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:45:22 +0000 (08:45 -0700)]
am
51c578b6: am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
51c578b64b7cd3e2fb8c3370d398507e28a47adc':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:42:57 +0000 (08:42 -0700)]
am
df056837: am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
df0568374da4856271a1a678208c638a0276b169':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:41:21 +0000 (08:41 -0700)]
am
ef64fc32: Merge "Track libcore DirectByteBuffer cleanup."
* commit '
ef64fc32d412d64e180cb90ee29ff46af7391580':
Track libcore DirectByteBuffer cleanup.
Elliott Hughes [Thu, 28 Mar 2013 15:29:43 +0000 (15:29 +0000)]
Merge "Track libcore DirectByteBuffer cleanup."
The Android Automerger [Thu, 28 Mar 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 27 Mar 2013 23:23:35 +0000 (16:23 -0700)]
Track libcore DirectByteBuffer cleanup.
Bug: https://code.google.com/p/android/issues/detail?id=53637
Change-Id: I7acd990a2a48b41dacb5b09f6410b4634dd60438
Elliott Hughes [Wed, 27 Mar 2013 18:40:48 +0000 (11:40 -0700)]
am
ded82b0b: am
fe659ef3: am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
ded82b0bc843702b219751768841b062e6cfc586':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 18:38:36 +0000 (11:38 -0700)]
am
fe659ef3: am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
fe659ef319aa5ca6f4e8a263feee768dab2d3ea3':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 18:37:05 +0000 (11:37 -0700)]
am
11905a14: am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
11905a146b94c7ec4a6880ad6f771d21abef0f31':
pthread_create doesn't set errno.
The Android Automerger [Wed, 27 Mar 2013 12:55:31 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 27 Mar 2013 00:27:53 +0000 (17:27 -0700)]
am
69476215: Merge "pthread_create doesn\'t set errno."
* commit '
694762158ac19c2abd795d7af78d3d9b9318a7d3':
pthread_create doesn't set errno.
Elliott Hughes [Wed, 27 Mar 2013 00:22:16 +0000 (00:22 +0000)]
Merge "pthread_create doesn't set errno."
Elliott Hughes [Tue, 26 Mar 2013 23:58:09 +0000 (16:58 -0700)]
am
c327b1e3: am
63a134f2: am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
c327b1e38dbec823d4f49c42adaa9a0a8042e3ed':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:55:36 +0000 (16:55 -0700)]
am
63a134f2: am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
63a134f2f2c2edd89116a6b8f53da97a07dcbf4e':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:51:12 +0000 (16:51 -0700)]
am
6be063d7: am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
6be063d7e6e1ff2224134852a628384d8d626636':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 23:25:15 +0000 (16:25 -0700)]
pthread_create doesn't set errno.
Let's try to get slightly better logging and exception detail messages.
Also fix the "set but not read" warnings for the other pthread functions
in this file.
Bug:
8470684
Change-Id: I7f9dbb4d39b4e3022cd5f1a8a45c6426e68c858b
Elliott Hughes [Tue, 26 Mar 2013 22:51:44 +0000 (15:51 -0700)]
am
2a41b0b7: Merge "Print the locker thread when waiting on an object"
* commit '
2a41b0b731a6b70410a7d23aa772ef1d17ad0e32':
Print the locker thread when waiting on an object
Elliott Hughes [Tue, 26 Mar 2013 22:33:07 +0000 (22:33 +0000)]
Merge "Print the locker thread when waiting on an object"
The Android Open Source Project [Tue, 26 Mar 2013 19:17:44 +0000 (12:17 -0700)]
am
b0f9ba36: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b0f9ba36ea2c6bcd78398c62a8ee91d3b3e7fd12':
The Android Open Source Project [Tue, 26 Mar 2013 17:49:06 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0fe603df487fa9a987a7d450eef7e2aadb5dd090
The Android Automerger [Mon, 25 Mar 2013 12:55:33 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 21 Mar 2013 17:38:14 +0000 (17:38 +0000)]
am
b9a12d8f: am
20f0fe69: am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
b9a12d8ff38df30199088ebbf051a9508691ef4a':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:37:07 +0000 (17:37 +0000)]
am
20f0fe69: am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
20f0fe6909748e08ff7d0add9d08d497618ec94a':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:34:06 +0000 (10:34 -0700)]
am
12b9e51f: am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
12b9e51f8089c250d2a1b7a45b56bb355c4eca59':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:32:11 +0000 (10:32 -0700)]
am
77059520: Merge "javac should have matching -source and -target flags."
* commit '
77059520ccee59c57de58e4dbafcf2cf16d42f55':
javac should have matching -source and -target flags.
Elliott Hughes [Thu, 21 Mar 2013 17:27:23 +0000 (17:27 +0000)]
Merge "javac should have matching -source and -target flags."
Elliott Hughes [Thu, 21 Mar 2013 17:25:39 +0000 (10:25 -0700)]
javac should have matching -source and -target flags.
Change-Id: I2ac5f0685bd5844252cc334d4040d68e01d39429
The Android Open Source Project [Wed, 20 Mar 2013 16:46:46 +0000 (16:46 +0000)]
am
6b094a67: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
6b094a67a25e6ebe53abb1748df05729244c125e':
The Android Open Source Project [Wed, 20 Mar 2013 16:32:16 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I63d012a7e3ff3411b6fa088f7daddffeda11fd79
The Android Automerger [Wed, 20 Mar 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Tue, 19 Mar 2013 23:53:17 +0000 (23:53 +0000)]
am
12bfdf20: am
57402cd5: am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
12bfdf2024180c3cd361b9d76ed7874864b6d2d1':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:50:46 +0000 (23:50 +0000)]
am
57402cd5: am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
57402cd539d30a6719d554b8bd9771f6d34230b4':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:48:06 +0000 (16:48 -0700)]
am
e04f68bc: am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
e04f68bceb2a61fef67b2da4e2c2bd67fa113a23':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:46:18 +0000 (16:46 -0700)]
am
06e6a1da: Merge "Fix a Field.isAnnotationPresent crash."
* commit '
06e6a1da8df286f7958f849a79a734b0b23d9b95':
Fix a Field.isAnnotationPresent crash.
Elliott Hughes [Tue, 19 Mar 2013 23:36:48 +0000 (23:36 +0000)]
Merge "Fix a Field.isAnnotationPresent crash."
Elliott Hughes [Tue, 19 Mar 2013 21:41:42 +0000 (14:41 -0700)]
Fix a Field.isAnnotationPresent crash.
For instances of Proxy, generated at runtime, there is no corresponding
.dex file.
Bug: https://code.google.com/p/android/issues/detail?id=24846
Change-Id: I36da43d5279a61b8cb71cdf2bbc3065b6a979830
The Android Automerger [Thu, 14 Mar 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 14 Mar 2013 06:15:36 +0000 (06:15 +0000)]
am
4b1163d3: am
26142726: am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
4b1163d303160cc3dbda8def49e7d84d332eb1d2':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 06:13:27 +0000 (06:13 +0000)]
am
26142726: am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
2614272692e34791a3f4bc598cb578889f1124ae':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 06:10:58 +0000 (23:10 -0700)]
am
a5a8b91a: am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
a5a8b91a337e0bb02ff1130e5362da2237acfb7d':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 01:49:49 +0000 (18:49 -0700)]
am
217e8e0d: Merge "Check JavaVMAttachArgs::version in CheckJNI."
* commit '
217e8e0dc89f20638807bdd179d54056c45f7901':
Check JavaVMAttachArgs::version in CheckJNI.
Elliott Hughes [Thu, 14 Mar 2013 01:40:17 +0000 (01:40 +0000)]
Merge "Check JavaVMAttachArgs::version in CheckJNI."
Elliott Hughes [Thu, 14 Mar 2013 01:35:54 +0000 (18:35 -0700)]
Check JavaVMAttachArgs::version in CheckJNI.
Bug:
8363798
Change-Id: I314bf6d5d64a1e27ad2c1580532133859031c623
The Android Open Source Project [Tue, 12 Mar 2013 14:16:41 +0000 (14:16 +0000)]
am
b902a056: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b902a0562c2b292f83214c24694e39ecfed78319':
The Android Open Source Project [Tue, 12 Mar 2013 14:14:18 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I062436d66259d1d6a36f84c2802a89f42df11140
The Android Automerger [Thu, 7 Mar 2013 13:55:13 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 6 Mar 2013 16:59:04 +0000 (16:59 +0000)]
am
a84e2faa: am
c881b1e6: am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
a84e2faa59d0bda1abc9c844f90dff07cdfcf6c6':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:56:49 +0000 (16:56 +0000)]
am
c881b1e6: am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
c881b1e656d6b77f2c2f2ebd52c7ad23aa65be98':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:54:00 +0000 (16:54 +0000)]
am
ff38bd30: am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
ff38bd30c42ecf85eab3d07efdb18b5c77cadb5a':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:51:28 +0000 (08:51 -0800)]
am
b32addbf: Merge "Don\'t crash if the dmtracedump -d file doesn\'t exist."
* commit '
b32addbf84d228e119268f94816a8e60dcd87214':
Don't crash if the dmtracedump -d file doesn't exist.
Elliott Hughes [Wed, 6 Mar 2013 16:35:01 +0000 (16:35 +0000)]
Merge "Don't crash if the dmtracedump -d file doesn't exist."
The Android Automerger [Wed, 6 Mar 2013 13:55:20 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Wed, 6 Mar 2013 06:42:37 +0000 (22:42 -0800)]
Don't crash if the dmtracedump -d file doesn't exist.
Change-Id: Ie4b504b43a8a61d09ca60d68b1a62694391ac223
Nick Kralevich [Tue, 5 Mar 2013 21:07:50 +0000 (21:07 +0000)]
am
a786f32d: am
b64e9cba: Zygote: set PR_SET_NO_NEW_PRIVS
* commit '
a786f32dbdebc7731abdb2d28de067f04706abf7':
Zygote: set PR_SET_NO_NEW_PRIVS
Nick Kralevich [Tue, 5 Mar 2013 21:05:24 +0000 (21:05 +0000)]
am
b64e9cba: Zygote: set PR_SET_NO_NEW_PRIVS
* commit '
b64e9cba72fb223fb440c150a951bb240df8beee':
Zygote: set PR_SET_NO_NEW_PRIVS
Nick Kralevich [Mon, 4 Mar 2013 19:38:30 +0000 (11:38 -0800)]
Zygote: set PR_SET_NO_NEW_PRIVS
call prctl(PR_SET_NO_NEW_PRIVS, 1) to prevent Zygote and zygote
spawned applications from aquiring new privileges.
Change-Id: I69bbf6bb5b01b877de414ecad43d3dffbd5fcea0
The Android Open Source Project [Mon, 4 Mar 2013 19:10:14 +0000 (19:10 +0000)]
am
c0132915: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
c01329154dadbd8bc9928256a7d15c06a6447fbe':
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
The Android Open Source Project [Mon, 4 Mar 2013 19:06:32 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id42d349a9e211c06f73f33214d97875c6ec7beb4
The Android Automerger [Mon, 4 Mar 2013 13:55:15 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Fri, 1 Mar 2013 19:17:00 +0000 (19:17 +0000)]
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
6e2d46fd7488331181502a878959336966ac3776':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:21:45 +0000 (19:21 +0000)]
am
36ba3589: am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
36ba3589cf5b20acc1f9d9bf7f88390fa6f8129a':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:17:00 +0000 (19:17 +0000)]
am
6e2d46fd: am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
6e2d46fd7488331181502a878959336966ac3776':
Fix -Xjitthreshold (for real this time).
Elliott Hughes [Fri, 1 Mar 2013 19:14:57 +0000 (11:14 -0800)]
am
03a938bc: Merge "Fix -Xjitthreshold (for real this time)."
* commit '
03a938bca80d83378844f7923bc2f8c6e6ec64a7':
Fix -Xjitthreshold (for real this time).
OSDN Git Service
