summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am b3478f4a: Merge "Fix regression: log mem maps around native fault ↵Christopher Tate2013-04-181-10/+11
|\ | | | | | | | | | | | | address" into jb-mr2-dev * commit 'b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea': Fix regression: log mem maps around native fault address
| * Merge "Fix regression: log mem maps around native fault address" into jb-mr2-devChristopher Tate2013-04-181-10/+11
| |\
| | * Fix regression: log mem maps around native fault addressChristopher Tate2013-04-181-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the logging of the mem maps around the fault address along with the rest of the faulting thread's information. (It was still being written to the tombstone file, but the logging got dropped on the floor in the refactoring around AM report integration). Bug 8654694 Change-Id: Id8851fa765dfe6b6ce41ccfc39e85eaac0acc629
* | | am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-devAlex Ray2013-04-181-0/+54
|\ \ \ | |/ / | | | | | | | | | * commit 'ca0cb785cb6a2316e9102059993e0a173220c92d': graphics: add Android flexible YCbCr format
| * | Merge "graphics: add Android flexible YCbCr format" into jb-mr2-devAlex Ray2013-04-181-0/+54
| |\ \ | | |/ | |/|
| | * graphics: add Android flexible YCbCr formatAlex Ray2013-04-091-0/+54
| | | | | | | | | | | | Change-Id: I3f6676873febc793f7a4a5e06892cd9fadb35665
* | | am d7cab8bf: Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit 'd7cab8bff1334ba48620a16d1b98f2ae623fee7d': adb : add missing connection states
| * \ \ Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
| |\ \ \
| | * | | adb : add missing connection statestrevd2013-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both CS_RECOVERY and CS_SIDELOAD where not being checked by connection_state_name which resulted in adb get-state returning unknown when a device is in those modes. Change-Id: I00716024d6a0bdb68d6e2380c8cd7b5d056bd15f Signed-off-by: trevd <trevd1234@gmail.com>
* | | | | am ffc5a4a5: Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ffc5a4a529338c834954e58de2701572eb0752f0': Add OUYA VID to known VID list
| * | | | Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add OUYA VID to known VID listAl Sutton2013-04-171-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add the OUYA VID to the list of known USB VIDs to allow developers with OUYA consoles to have their device automatically recognized. Change-Id: I499114d8071747b972c24681fc0771f000ad9f9d
* | | | am 25538257: Merge "cutils: add a way to disable tracing for a process" into ↵Jamie Gennis2013-04-162-12/+36
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '2553825797c40b14981b1b24e44475e07b02267f': cutils: add a way to disable tracing for a process
| * | | Merge "cutils: add a way to disable tracing for a process" into jb-mr2-devJamie Gennis2013-04-162-12/+36
| |\ \ \
| | * | | cutils: add a way to disable tracing for a processJamie Gennis2013-04-152-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the atrace_set_tracing_enabled call to libcutils. The call can be used to disable all tracing (of the atrace variety) for the current process. This is to be used to disable tracing in the Zygote process, as there is no way for Zygote to be notified of changes to the enabled trace tags. Change-Id: I0b691cc0dcfc65b16e3d17e1db2866a4deb253a7
* | | | | am ebcf93e3: Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea': Add logic to fixup file contexts after a policy update.
| * | | | Add logic to fixup file contexts after a policy update.Geremy Condra2013-04-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8116902 (cherry picked from commit 47677a506febfe386d186f8f854d967f165a342f) Change-Id: I2a50f68a53aee2c94d03d3e5ced1ea36337fde33
* | | | | am ebbe9807: Include liblog in fs_mgr to fix the build.Ken Sumrall2013-04-151-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ebbe9807906dad946659b6e9f849030eaa87731b': Include liblog in fs_mgr to fix the build.
| * | | | Include liblog in fs_mgr to fix the build.Ken Sumrall2013-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change to how libcutils is built requires liblog to be explicitly included in the link list if it's needed. Change-Id: I8547f5e65c488c8f6e314ccd4eb96606742272be
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I5bcebe96be1d96d4e9f694eef967ca076310cfa1
| * \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the ↵Ken Sumrall2013-04-153-19/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel log" into jb-mr2-dev * commit '1a6d9ec2af7b3151c64a167162c87d258d30735b': fs_mgr: Capture the output of e2fsck and add to the kernel log
| * | | | | | Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into ↵Ken Sumrall2013-04-153-19/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | * | | | | | fs_mgr: Capture the output of e2fsck and add to the kernel logKen Sumrall2013-04-143-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the output of e2fsck is not saved, and we have no insight into how many errors e2fsck is finding and fixing. Using the new abbreviated logging feature in liblogwrap, up to the first 100 lines, and last 4K bytes of the output of e2fsck is captured by fs_mgr, and added to the kernel log. Usually, the filesystem will be clean, and this will only add a few lines to the kernel log on boot, but when things go wrong, it should save enough to indicate what the problem is, without potentially filling the kernel log with only e2fsck output if the filesystem is really corrupted. Change-Id: I9c264798e6fe721c8f818b5ce15d0975027ddbdd
* | | | | | | | am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into ↵Ken Sumrall2013-04-154-46/+371
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '1f75eb1eae4dde3e7d8c625fca3063cf5a488079': logwrapper: Add ability to log to kernel log
| * | | | | | | Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-devKen Sumrall2013-04-154-46/+371
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | logwrapper: Add ability to log to kernel logKen Sumrall2013-04-144-46/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add ability to do abbreviated logging where only the first 4K bytes and last 4K bytes of output are added to the desginated log. Also update standalog logwrapper command to support the new options. Change-Id: Ia49cbe58479b9f9ed077498d6852e20b21287bad
* | | | | | | | am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into ↵Ken Sumrall2013-04-152-1/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '774814d1940a87175fc7dc692fef5c626d893968': klog: Have klog_write() call klog_init() if needed
| * | | | | | | Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-devKen Sumrall2013-04-152-1/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | klog: Have klog_write() call klog_init() if neededKen Sumrall2013-04-112-1/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Also change klog_init() to do nothing if already initialized. Change-Id: Ia2dfe914c9d9fd119fb8939508d57b15c9884663
* | | | | | am 24bc41b7: Add new resources trace.Dianne Hackborn2013-04-121-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '24bc41b78ca004ac7a6873054ff919da1ba9a6f8': Add new resources trace.
| * | | | | Add new resources trace.Dianne Hackborn2013-04-121-1/+2
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I63398f282fe7bf04f1c4cefa8f602100f403fa7c
* | | | | am c796ed97: We need libcutils to include liblogYing Wang2013-04-111-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c796ed97466510dd5239008554decbe72825e19c': We need libcutils to include liblog
| * | | | We need libcutils to include liblogYing Wang2013-04-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some prebuilts were built against libcutils with liblog in it. Unfortunately that means in the future if someone checks in prebuilts that are built against libcutils and they don't explicitly link against liblog, they will again prevent us from removing liblog from libcutils. Bug: 8587800 Bug: 8580410 Change-Id: I2a5ed6233df7e7d542d1e4167bec405750c0e671
* | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099
| * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 083b5ccb: Add liblogYing Wang2013-04-097-11/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27': Add liblog
| * | | | Add liblogYing Wang2013-04-097-11/+14
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 8580410 Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
* | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I4d242b2cbadf2c9bcdeeff721a83528cd02b3c0e
| * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | |\ \
* | | \ \ am 578b7473: Merge "libsparse: Fix null pointer issue"Colin Cross2013-04-061-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit '578b74734c1cfc773f3213a23a7195aa4b5b97aa': libsparse: Fix null pointer issue
| * | | | Merge "libsparse: Fix null pointer issue"Colin Cross2013-04-061-0/+3
| |\ \ \ \
| | * | | | libsparse: Fix null pointer issueHong-Mei Li2013-04-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the issue that "out" pointer is dereferenced without checking. Change-Id: I76a57ad7309841218231346f4807ef2be8628737 Signed-off-by: Hong-Mei Li <a21834@motorola.com>
* | | | | | am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6e0b9ecb503b5611d815214e0a134ea0b1395089': toolbox/dmesg: do not hardcode KLOG_BUF_LEN
| * | | | | Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"Colin Cross2013-04-061-6/+21
| |\ \ \ \ \
| | * | | | | toolbox/dmesg: do not hardcode KLOG_BUF_LENJames Sullins2013-04-011-6/+21
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
* | | | | | am 1615c09a: Merge "init: Fix potential null pointer issue"Colin Cross2013-04-051-9/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1615c09ac1065104f56ddc444f5467aff76c0daa': init: Fix potential null pointer issue
| * | | | | Merge "init: Fix potential null pointer issue"Colin Cross2013-04-061-9/+9
| |\ \ \ \ \
| | * | | | | init: Fix potential null pointer issueHong-Mei Li2013-04-011-9/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the old strdup() mechanism, it may return NULL if insufficient memory was available. So we check the return value or do not use strdup to avoid null pointer issue. Change-Id: Id684948d6cb6c2f06327f29a2ba692f9542fce80 Signed-off-by: Hong-Mei Li <a21834@motorola.com>
generated by cgit v1.1 at 2025-02-07 03:18:39 +0000