Commit graph

2974 commits

Author SHA1 Message Date
Dima Zavin
3c58933aa7 am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '4a2539085062a715b0d345eb50ea48738423c909':
  rootdir: init.rc: write default oom_adj before starting ueventd
2011-11-07 17:32:02 +00:00
Dima Zavin
4a25390850 rootdir: init.rc: write default oom_adj before starting ueventd
Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
2011-11-04 12:45:56 -07:00
The Android Open Source Project
6182d031d7 Reconcile with ics-factoryrom-2-release
Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96
2011-11-04 07:57:25 -07:00
The Android Automerger
b1966c5e76 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 21:04:38 -07:00
The Android Automerger
08ffd07a88 Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
2011-11-02 21:04:22 -07:00
The Android Automerger
86eeea5ce8 Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
2011-11-02 21:04:09 -07:00
The Android Automerger
23420745e2 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:30 -07:00
The Android Open Source Project
0e4d9eb8f8 Reconcile with ics-factoryrom-2-release
Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624
2011-11-02 10:53:31 -07:00
The Android Automerger
6641b39923 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 10:18:15 -07:00
The Android Automerger
fa792b19cc Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
2011-11-02 10:18:01 -07:00
The Android Automerger
77aa295272 Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
2011-11-02 10:17:46 -07:00
The Android Automerger
df241e54ae merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:57 -07:00
The Android Automerger
6d9f02302d Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 04:41:24 -07:00
Dmitry Shmidt
e71846671e am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0
* commit '4f7c0843bbaa9cb4ec3a7890461cebbee689530a':
  libnl_2: Fix memory leaks
2011-11-02 00:13:04 +00:00
Dmitry Shmidt
4f7c0843bb Merge "libnl_2: Fix memory leaks" into ics-mr0 2011-11-01 17:12:02 -07:00
Dmitry Shmidt
d99fe5ec96 libnl_2: Fix memory leaks
BUG: b/5532633

Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-11-01 15:56:22 -07:00
Dima Zavin
3e3d0780fc am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0
* commit '6fb3df8d468a105b49c1cdbbdcb061dc8de022a4':
  charger: make the almost-full frame only show when it's current level
2011-11-01 22:30:25 +00:00
Dima Zavin
6fb3df8d46 Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0 2011-11-01 15:28:42 -07:00
Irfan Sheriff
a7997f4ae2 am d4f29767: Merge "Remove log spam" into ics-mr0
* commit 'd4f29767c8cd5a0d8b52b77bed117ca3746af8f3':
  Remove log spam
2011-11-01 20:19:46 +00:00
Irfan Sheriff
d4f29767c8 Merge "Remove log spam" into ics-mr0 2011-11-01 13:17:53 -07:00
Dima Zavin
9ec3f3e2e4 charger: make the almost-full frame only show when it's current level
Change-Id: Id53de101dd3c211d376abfd748e7646e28291749
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-31 17:04:33 -07:00
Mathias Agopian
04a875902e restart surfaceflinger and drmserver when servicemanager dies
Bug: 5450389

Change-Id: Ib4e73836721e25e2a88185167b030ea75e0d74e3
2011-10-31 14:27:47 -07:00
Irfan Sheriff
477df68854 Remove log spam
Bug: 5533986
Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
2011-10-28 23:57:32 -07:00
Jeff Sharkey
70212a404a Merge "Gracefully handle truncated log messages." into ics-mr1 2011-10-28 11:56:17 -07:00
Jean-Baptiste Queru
71619f1395 am 604f52e3: Reconcile with AOSP master
* commit '604f52e31357a774ad49290e323976b1db5b9f38':
  Fix build
2011-10-28 15:39:50 +00:00
Jean-Baptiste Queru
604f52e313 Reconcile with AOSP master
Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235
2011-10-28 08:37:28 -07:00
Steve Block
31a02dba70 Fix build
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
2011-10-28 15:38:20 +01:00
Ken Sumrall
72410ccfaa am a286480f: Fix the class_reset command
* commit 'a286480f56012abdb4ef4ddab1c19a5c2316b7b8':
  Fix the class_reset command
2011-10-27 02:49:44 +00:00
Jeff Sharkey
a820a0e587 Gracefully handle truncated log messages.
Bug: 5522726
Change-Id: I8637c7da854ec1ecb321632c45ee9bc2edc94a67
2011-10-26 18:59:42 -07:00
Ken Sumrall
a286480f56 Fix the class_reset command
The class_reset command used to reset services that had been set to
"disabled" in the init.rc file to a non-disabled state.  Now, if the
service was originally set to "disabled", have the reset command set
it back to disabled.  Otherwise, set it to the "reset" state as it
currently does.

Change-Id: I0c10582e46a8e443d4748d9d893ae762b19b653a
2011-10-26 16:58:27 -07:00
Andy McFadden
08dedcfd5c Enable verbose register memory dumps
Dump some memory at addresses for all registers that look like they
might have valid addresses.  Previously this was only done for PC
and LR.

(This is expected to be disabled before ship.)

Bug 5484924

Change-Id: I9802eaa396783e1286ae0c53eaf2473892c38a02
2011-10-19 13:28:33 -07:00
Andy McFadden
c69b6b70e3 Merge "Add log summary to tombstones" 2011-10-19 12:01:26 -07:00
Nick Kralevich
b62ace9132 Merge "liblog: do better checks of log messages." 2011-10-19 09:13:04 -07:00
Andy McFadden
e5cc5396e8 Add log summary to tombstones
When the tombstones are uploaded to APR, they're truncated at 64KB.
This causes the log data, which is at the end, to be lost if the
process has more than about 12 threads (which many do).

This change adds the last few lines of the log right below the
report for the crashing thread, where we should be guaranteed to
keep it.

Also, clean up trailing newlines on log messages (which end up in
the tombstone), and don't print a "------- log" banner if there
aren't any messages in that log file (e.g. slog).

Also also, don't try to show_nearby_maps unless this is the crashing
thread.

Bug 5471955

Change-Id: Iaa4fd2fafbaeda2f20bb95f202177d7744a91f9d
2011-10-18 20:20:14 -07:00
Andy McFadden
05a28e1cd4 Merge "Enhance debuggerd memory dumps" 2011-10-18 17:12:21 -07:00
Andy McFadden
f2eae5a860 Enhance debuggerd memory dumps
This makes two changes:

(1) Display ASCII values next to the memory dumps.  For example:

I DEBUG: 00008ac4 706f6f4c 20676e69 74206425 73656d69  Looping %d times
I DEBUG: 00008ad4 7453000a 6e69726f 6f742067 0a702520  ..Storing to %p.
I DEBUG: 00008ae4 65642f00 657a2f76 55006f72 6c62616e  ./dev/zero.Unabl

(The hex values are still displayed as little-endian word values, while
the ASCII part is byte oriented.)

(2) Optionally display memory dumps for all registers, not just LR
and PC, for the crashing thread.  This is meant for situations where
we crash dereferencing foo->bar and want to see what the memory near
"foo" looks like -- could be handy if it got stomped by MUTF-16 text
or something recognizable.

Change #2 is currently disabled, via a compile-time setting.

Bug 5471955

Change-Id: Iacfd01c314055bad81db2f43b7d239f10086fcfb
2011-10-18 16:18:02 -07:00
Nick Kralevich
e1ede1530f liblog: do better checks of log messages.
Testing:

The following test cases all passed and generated log entries:

 # echo -n '\03foo\0bar\0' > /dev/log/main
 # echo -n '\03\0bar\0' > /dev/log/main
 # echo -n '\03\0a\0' > /dev/log/main

The following entries were successfully processed by
logcat but produced no log entries:

 # echo -n '\03\0\0' > /dev/log/main
 # echo -n '\03a\0\0' > /dev/log/main
 # echo -n '\03b\0\0' > /dev/log/main

Also tested the pathological error condition:

 cat /dev/urandom > /dev/log/main

which produced many "+++ LOG: malformed log entry" errors.

Bug: 5478600
Change-Id: I53bc79507242dcfc14445746c29edf47be0a90b4
2011-10-18 15:37:15 -07:00
Nick Kralevich
4423df76f5 Merge "logcat: add sanity check" 2011-10-18 12:42:26 -07:00
sinikang
8cdd4c335f am aa75df74: [maguro] : add setprop net.tcp.buffersize.hspa
* commit 'aa75df74db5beffd25821ed6c360c36197d7bac1':
  [maguro] : add setprop net.tcp.buffersize.hspa
2011-10-17 17:03:15 -07:00
sinikang
aa75df74db [maguro] : add setprop net.tcp.buffersize.hspa
-window size optimized for hspa
-Patchset2 : space removed

Change-Id: Ia4d1043d1a93c929721a4d7cca60ce9ff8bbf67a
Signed-off-by: sinikang <sinikang@samsung.com>
2011-10-17 15:56:02 -07:00
David 'Digit' Turner
50f128a392 am 0f9581ab: (-s ours) am b064ed88: (-s ours) am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
* commit '0f9581abf24738c03f572d12f8ef343b66145c61':
  DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
2011-10-17 14:09:56 -07:00
David 'Digit' Turner
0f9581abf2 am b064ed88: (-s ours) am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
* commit 'b064ed888aaf6c3abbb839dfc60b9b8bfd17fa88':
  DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
2011-10-17 14:06:45 -07:00
David 'Digit' Turner
b064ed888a am 6306d419: DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
* commit '6306d4192558c56ac130fe6d66fbca227fd137d6':
  DO NOT MERGE libsysutils: Fix potential overwrites in FrameworkListener
2011-10-17 14:03:37 -07:00
Nick Kralevich
46070505e7 logcat: add sanity check
Sanity check that the length we get back from the kernel matches
how much data we actually received.

Change-Id: I5cfd80321ab41459bb514dfde2da57413a7bd9e6
2011-10-17 11:40:06 -07:00
Nick Kralevich
63f4a84104 liblog: ensure that the message length is consistent
When parsing log entries which may have embedded \0s, it's
possible for entry->messageLen to not be the actual
length of the string in entry->message.  Detect this condition.

Bug: 5417417
Change-Id: I712cac7696af7831e24765b5a1b345d6ff5fb407
2011-10-17 10:47:04 -07:00
Andy McFadden
76feaf3721 Merge "Append log data to tombstones" 2011-10-14 10:44:59 -07:00
Andy McFadden
41e0cef301 Append log data to tombstones
The Android Problem Report site shows tombstones uploaded from
devices.  We can see the native stack traces for every thread,
but sometimes there's a very important bit of information sitting
in the log, and without it we can't analyze the failure.

This change modifies debuggerd so that the log contents for the
crashing process are appended to the tombstone.  The format matches
the output of "logcat -v threadtime".  Both "system" and "main" logs
are included (but not interleaved -- we're not that fancy).

This feature is only enabled when the "ro.debuggable" system property
is set to 1 (indicating a development device).

Bug 5456676

Change-Id: I3be1df59813ccf1058cec496a906f6d31fbc7b04
2011-10-13 16:05:08 -07:00
Andy McFadden
90e6f931f2 Merge "Show maps near native fault address" 2011-10-13 15:36:36 -07:00
Dima Zavin
6606dc9532 am 471157a3: charger: key state being the same is not an error
* commit '471157a393d052aece013d1f8b7701aaadca3b6c':
  charger: key state being the same is not an error
2011-10-13 13:30:00 -07:00
Dima Zavin
471157a393 charger: key state being the same is not an error
Change-Id: I58d53899dbcca8329b65b189c1a6c5eea413c289
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-13 13:04:38 -07:00