OSDN Git Service
Jean-Baptiste Queru [Fri, 14 Jun 2013 15:34:02 +0000 (08:34 -0700)]
am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda':
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:33:07 +0000 (22:33 -0700)]
am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
381868f347d413a671a6ad9c0af64d258a060b99':
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':
Jamie Gennis [Wed, 8 May 2013 01:24:29 +0000 (01:24 +0000)]
Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
Jamie Gennis [Tue, 7 May 2013 22:37:01 +0000 (15:37 -0700)]
Add systrace tracing for GC and thread suspension.
Bug:
8856374
Change-Id: I58420a14fb52eab6295381a4d8f2d59eacfe0473
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
(cherry-pick from master If6fcac93a229edf068eb02ceceb374e3dc284b78)
Change-Id: I120af6f753984d63d43122ea30db102bd1d5cc63
Xavier Ducrohet [Thu, 25 Apr 2013 02:09:32 +0000 (19:09 -0700)]
am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
33b5dfb684910c5dbcd0e58f24a90ead01078629':
Fix dx to match the new SDK structure.
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:04:36 +0000 (02:04 +0000)]
Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
Raphael Moll [Thu, 25 Apr 2013 02:03:12 +0000 (19:03 -0700)]
am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
8f93edacdb6270a48f98aa3a82733f0f912d333a':
Fix dx.bat 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.
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
(Cherry-pick from
c26c1291743ce7877cf11f3dc73d6f0c240229f7)
Change-Id: Ied431777e178529f1e2360bfbd69d2738839d5c6
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 [Tue, 23 Apr 2013 18:35:17 +0000 (11:35 -0700)]
Remove spammy logging from
8470684 investigation.
This has been tracked down to a kernel bug, so we no longer need
the extra diagnostics.
Bug:
8470684
(cherry picked from commit
3a9dbd30eb1598c737af7ef6110d46767d6e0336)
Change-Id: I0877a24a5a409695c3a1a9ddb5c7c4d78e6a578e
Elliott Hughes [Wed, 17 Apr 2013 19:08:56 +0000 (12:08 -0700)]
Work around a dalvik JDWP/GC deadlock.
Also add a few missing TEMP_FAILURE_RETRYs that can cause dalvik to
incorrectly decide that the debugger connection has been broken.
Bug:
8191824
(cherry picked from commit
b680ae3140a789f182c26abf8df9645f7744113a)
Change-Id: I92736a1ad2f06caba30506d05bfa59fccbeee834
Elliott Hughes [Fri, 12 Apr 2013 18:51:51 +0000 (11:51 -0700)]
More native stack dump hardening.
Threads just starting up or shutting down might not have any managed
stack frames, leading to a NULL "currFrame" frame pointer in the
interpreter stack.
Bug:
8596028
(cherry picked from commit
46371593812d966c40e1ec4019e3c7c6613046a6)
Change-Id: I0fbc6d422bcae0fd080f7c1a63198755235e9e00
Elliott Hughes [Thu, 11 Apr 2013 23:28:38 +0000 (16:28 -0700)]
Harden the native stack dumping decision.
We've seen monkey crashes in this code, though I haven't been
able to reproduce them in my own SIGQUIT stress tests. Address
the two most likely causes of trouble: dumping the signal catcher's
own thread (which will always be runnable), and assuming that the
Method* pulled from the save area is non-NULL.
(cherry-pick of
feddac5b7718dd8141391bfeb6359f1906542823.)
Bug:
8596028
Change-Id: I7a70ce047c8285715eb7bbb9438e8ef5d81fc59c
Ying Wang [Wed, 10 Apr 2013 04:42:36 +0000 (21:42 -0700)]
Add liblog
Bug:
8580410
Change-Id: I649849a3a8d97a2555862ec70a1a2ca73b77cc4d
Xavier Ducrohet [Mon, 8 Apr 2013 18:45:21 +0000 (18:45 +0000)]
Merge "Fix dx to match the new SDK structure." into jb-mr2-dev
Elliott Hughes [Fri, 5 Apr 2013 22:45:24 +0000 (15:45 -0700)]
Dump native stacks for all threads in native code.
Bug:
7432159
(cherry picked from commit
890ce010c4846deb82d3ac09b6d2ceb76e59fb67)
Change-Id: I12e9b6998f2119e0fabb5717e9c54c53f206d34f
Bill Buzbee [Thu, 4 Apr 2013 19:53:24 +0000 (19:53 +0000)]
Revert "Tiny optimization for complier templates for arm."
This reverts commit
87bc7988cdb4e61421a3e701e84f7070f603635d
No obvious problems with this change - but reverting to aid in tracking down bug:
8543495 NCs in Play Store : >>> com.android.vending
Change-Id: I8bd6dbe6a7b3a4650a5e857a5a529cde6569b987
You Kim [Tue, 2 Apr 2013 16:41:19 +0000 (01:41 +0900)]
Tiny optimization for complier templates for arm.
1. Remove possible bubble in TEMPLATE_STRING_INDEXOF.S
2. Remove 1 instruction and reorder the opcodes
TEMPLATE_MUL_LONG.S
3. Reorder ldr r2 instruction in TEMPLATE_RETURN.S
(cherry-pick of
a2dc68acd954827cdc67929a859354e5ed9b5713.)
Change-Id: I78b9797aff3c2255c5d34a8391b1a94a1b09b613
You Kim [Tue, 2 Apr 2013 16:58:30 +0000 (01:58 +0900)]
Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
(cherry-pick of
7bf47d1d0d95c3ea9dfa7472e473edc820f21009.)
Change-Id: I0d4b96125e185b37767873e6fd88a59b63b6f7bd
You Kim [Tue, 2 Apr 2013 17:13:46 +0000 (02:13 +0900)]
Fix a minor leaks caused by failed initializations.(typo)
(cherry-pick of
8e622221809bf852b1063db00493475b77beefed.)
Change-Id: I0ec95058616e48dbc574c5d207b4576923a0cc37
You Kim [Tue, 2 Apr 2013 17:47:24 +0000 (02:47 +0900)]
Fix a minor leak in handleVM_CreateString
(cherry picked from commit
b825d9f38b6359ec2ac23528ac0342838e1f152f)
Change-Id: Id62e1d68492bbaa7232f7dbb229ab95433f4eb8e
Udayan Banerji [Fri, 29 Mar 2013 21:05:18 +0000 (14:05 -0700)]
[x86] Fix errors with WITH_JIT_TUNING defined
This patch makes the necessary changes to pass on correct information to
dvmBumpNoChain, so that WITH_JIT_TUNING flag can be enabled for x86 codegen
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
19eb287ac848f10e03ca2614bf53bd9d1ddd3724)
Change-Id: I6871dd0839b3656beed4633e3a0f3df780af98a0
Udayan Banerji [Fri, 29 Mar 2013 20:32:10 +0000 (13:32 -0700)]
[x86] Terminate trace if SGET/SPUT have unresolved fields in codegen
The interpreter doesn't allow SGET/SPUT bytecodes in a trace till the field
is resolved. However, exhaustTrace can pick up bytecodes beyond the trace
sent by the interpreter. Terminate the loop formation if this is seen.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
4eb6d969de37f9b82aaa4089490900f620e50f46)
Change-Id: If5480640375a5152748e74e00be200d80f313b31
Udayan Banerji [Mon, 1 Apr 2013 21:27:09 +0000 (14:27 -0700)]
[x86] FPU stack needs to be reset after double conversion
The x86 codegen uses the FPU stack for double/float to long conversions. We
need to clear out the FPU stack after done, to prevent an eventual stack
overflow.
Signed-off-by: Udayan Banerji <udayan.banerji@intel.com>
(cherry picked from commit
05d4f7c4a9e0604a247954220363e28cc92c382d)
Change-Id: I2342de4b4efab74cb88471ded8dcc94899768d7c
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 [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 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 [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 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
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."
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: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.
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: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"
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
Change-Id: Id0551259e535b0006f4a2b719dbc17fa2f856242
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
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
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
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."
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 [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
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).
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 [Thu, 28 Feb 2013 22:43:30 +0000 (22:43 +0000)]
Merge "Zygote: remount /system nosuid/nodev" into jb-mr2-dev
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: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: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 [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: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()