summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"Brian Carlstrom2013-06-041-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071': Fixed reversed output in netstat Recv-Q Send-Q columns
| | * | | | | | Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"Brian Carlstrom2013-06-041-2/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Fixed reversed output in netstat Recv-Q Send-Q columnsBrian Carlstrom2013-06-031-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
* | | | | | | fix another misuse of strncatNick Kralevich2013-06-031-2/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has the potential to overflow "buffer" if the command line is more than 4K. Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
* | | | | | fix strncat misuseNick Kralevich2013-06-031-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The third argument of strncat() tells how much data to append from src, not the total size of the buffer. Change uses of strncat() to strlcat(), which has the buffer overflow protection behavior intended by the original author. This fixes the following compiler warning: In function 'strncat', inlined from 'print_type' at system/core/toolbox/lsof.c:76:12: bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default] Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
* | | | | | Merge "property_get: do argument checking."Nick Kralevich2013-05-241-0/+19
|\ \ \ \ \ \
| * | | | | | property_get: do argument checking.Nick Kralevich2013-05-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to verify, at compile time, that the supplied value buffer is large enough. Change-Id: I91fa560d3ceff87609194269356ac634bdbf2ede
* | | | | | | Merge "properties.h: avoid duplicating constant values"Nick Kralevich2013-05-241-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | properties.h: avoid duplicating constant valuesNick Kralevich2013-05-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the constant value from sys/system_properties.h, rather than having two copies of this constant in two different places. This partially addresses the TODO in the header file. Change-Id: Ic0b098cb8caf562ed2a25a0cf8cd412ba2e06884
* | | | | | | Merge "libcutils: Don't build host property support"Nick Kralevich2013-05-242-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | libcutils: Don't build host property supportNick Kralevich2013-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only build property support for the device, not for the host. Host side property support is being removed, as it was only really used for the simulator. process_name.c: When building this for the host, don't reference properties. Change-Id: Idcea5ad52a85e47eef17a381cb0601657efbdf13
* | | | | | | Merge "adb: Only use properties on device builds"Nick Kralevich2013-05-244-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | adb: Only use properties on device buildsNick Kralevich2013-05-234-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for the host, don't make reference to property_get / property_set. I'm in the process of removing host side support for properties. Change-Id: I691c5872b5fd538e78bc38a3fe72574cdc7f43c3
* | | | | | | Add ATRACE_TAG_RS.Tim Murray2013-05-231-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Iaff497a1cb04a797441b5bb47b30ad6f09db8e95
* | | | | | am 54d19aa6: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '54d19aa66c6d446c97172599a9317caa6c456741':
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I43fb882425fac784151bbf0a313661f3b684ac89
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-230-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am 5cb9a02b: am 7e723498: Merge "Add permission for bluetooth app in ↵Matthew Xie2013-05-221-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-primary users" into jb-mr2-dev * commit '5cb9a02b0322c18b48eb9ce261502c3b830c113c': Add permission for bluetooth app in non-primary users
| * | | | | am 7e723498: Merge "Add permission for bluetooth app in non-primary users" ↵Matthew Xie2013-05-221-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '7e72349865db83d62f98eec8bca4b170712fe0e0': Add permission for bluetooth app in non-primary users
| | * | | | Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-devMatthew Xie2013-05-221-0/+8
| | |\ \ \ \
| | | * | | | Add permission for bluetooth app in non-primary usersMatthew Xie2013-05-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 8954114 Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
* | | | | | | Merge "Format stack trace PC offset to 8 digits with leading zeros."Ben Cheng2013-05-211-8/+9
|\ \ \ \ \ \ \
| * | | | | | | Format stack trace PC offset to 8 digits with leading zeros.Ben Cheng2013-05-211-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 9067999 Change-Id: Ib5bbf2d5c166dc27e35386d589536eeb6b078c6a
* | | | | | | | am a9e08d3e: am 51a2e4d5: Merge "libsysutils: fix null pointer and memory ↵Colin Cross2013-05-211-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | leak issue" * commit 'a9e08d3ed60a12f58fc5fdf89f74b4f215ce066f': libsysutils: fix null pointer and memory leak issue
| * | | | | | am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue"Colin Cross2013-05-211-1/+8
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '51a2e4d5d44a6f788da207dff301356e16b4e283': libsysutils: fix null pointer and memory leak issue
| | * | | | | Merge "libsysutils: fix null pointer and memory leak issue"Colin Cross2013-05-211-1/+8
| | |\ \ \ \ \
| | | * | | | | libsysutils: fix null pointer and memory leak issueHong-Mei Li2013-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SocketClient::quoteArg function 1. Fix potential null pointer accessing issue 2. Fix potential memory leak introduced by realloc fail Change-Id: I1ca0f9089290d43452e9a71428244545f4ed866b Signed-off-by: Hong-Mei Li <a21834@motorola.com>
* | | | | | | | am 084753ee: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | * commit '084753eedba485673fd070c44bc4a7feb63af483':
| * | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | Change-Id: I7aa2dccba44773db134e6bef703ff9477ed159ba
| | * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-210-0/+0
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am 5f1a938e: am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated ↵Colin Cross2013-05-201-6/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | led-related nodes" * commit '5f1a938e9c65829c3afebb4d92c8e93caecc3e11': init.rc: remove duplicated led-related nodes
| * | | | | | | am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d8e8c147b41dbc6a5e4edf6da1610a83623b5b2': init.rc: remove duplicated led-related nodes
| | * \ \ \ \ \ \ am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '9246f8d6def40a50933a980fac773a909f2138d7': init.rc: remove duplicated led-related nodes
| | | * | | | | | Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | init.rc: remove duplicated led-related nodesSungmin Choi2013-05-191-6/+0
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibee7ef9137594fc4c30d3ab6ee7bdf3515836c62
* | | | | | | | | am 8f6adcfc: am 49be2407: Revert "Add logic to fixup file contexts after a ↵gcondra@google.com2013-05-201-6/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy update." * commit '8f6adcfcc55414cc07c18fe47d7c4314da148544': Revert "Add logic to fixup file contexts after a policy update."
| * | | | | | | | am 49be2407: Revert "Add logic to fixup file contexts after a policy update."gcondra@google.com2013-05-201-6/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '49be240735a06f44e1d91aa51dd299779ad36d96': Revert "Add logic to fixup file contexts after a policy update."
| | * | | | | | | Revert "Add logic to fixup file contexts after a policy update."repo sync2013-05-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea.
* | | | | | | | | am 253e91b4: am 477e35d6: Revert "Add persistent property for SELinux ↵gcondra@google.com2013-05-202-7/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enforcment status." * commit '253e91b4ffb631b188fdac0c1624786103471f05': Revert "Add persistent property for SELinux enforcment status."
| * | | | | | | | am 477e35d6: Revert "Add persistent property for SELinux enforcment status."gcondra@google.com2013-05-202-7/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6': Revert "Add persistent property for SELinux enforcment status."
| | * | | | | | | Revert "Add persistent property for SELinux enforcment status."repo sync2013-05-172-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b89bdfde422eff751b3f939f10ab57e22af83eaa.
* | | | | | | | | am 43329bc1: am 8a387870: Revert "Reload policy after setting up the data ↵gcondra@google.com2013-05-205-13/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partition." * commit '43329bc1c99c0f5f3670a8aaab39e54df34819a1': Revert "Reload policy after setting up the data partition."
| * | | | | | | | am 8a387870: Revert "Reload policy after setting up the data partition."gcondra@google.com2013-05-205-13/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a3878700eb9cd8ecf495cd01f15face5c3879c8': Revert "Reload policy after setting up the data partition."
| | * | | | | | | Revert "Reload policy after setting up the data partition."repo sync2013-05-175-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fee250d27a9c03af1ba439047b976d89563b1887.
* | | | | | | | | am f5410f2b: am 3d32cd93: Revert "Remove /system from the dirs to relabel."gcondra@google.com2013-05-201-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5410f2bde6fd5295cad36e3ba3efba0beb92780': Revert "Remove /system from the dirs to relabel."
| * | | | | | | | am 3d32cd93: Revert "Remove /system from the dirs to relabel."gcondra@google.com2013-05-201-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d32cd938746215e5fa9b1a3c3b78903e043ae73': Revert "Remove /system from the dirs to relabel."
| | * | | | | | | Revert "Remove /system from the dirs to relabel."repo sync2013-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3d4d07b2fa3b2447646d3c87a0b401e993ad8363.
* | | | | | | | | am b9866649: am 52351300: Revert "Add a version check for SELinux policy on ↵gcondra@google.com2013-05-202-62/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | device." * commit 'b9866649e24d7b6eedcaf2e03ffc605a3417537d': Revert "Add a version check for SELinux policy on device."
| * | | | | | | | am 52351300: Revert "Add a version check for SELinux policy on device."gcondra@google.com2013-05-202-62/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | * commit '52351300d156826bf22c493828571f45a1cea16a': Revert "Add a version check for SELinux policy on device."
| | * | | | | | Revert "Add a version check for SELinux policy on device."repo sync2013-05-172-62/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | This reverts commit 921be8b6568df0057c4eacbac2e1022b71e09620.