summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Windows adb: Make client stdout and stderr handles uninheritable"David Turner2013-01-211-0/+21
|\
| * Windows adb: Make client stdout and stderr handles uninheritableRay Donnelly2013-01-081-0/+21
| | | | | | | | Change-Id: Ib0519a199c9504aad1d0ecc3757f4d162984bf22
* | Merge "The localtime_tz and mktime_tz extensions are now in bionic."Elliott Hughes2013-01-156-3382/+1
|\ \
| * | The localtime_tz and mktime_tz extensions are now in bionic.Elliott Hughes2013-01-156-3382/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of d03072ffde3279fbb60591a0d07c820d8e792762. This change was originally committed to AOSP, is in internal master, but was somehow lost from AOSP.) Bug: 7012465 Conflicts: libcutils/Android.mk Change-Id: I08ee8eb9b8ce5d3f9d8f2e67437d653e08697bc1
* | Merge "Correct LOCAL_LDLIBS of adb"Ying Wang2013-01-081-2/+2
|\ \
| * | Correct LOCAL_LDLIBS of adbChih-Wei Huang2013-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | adb doesn't really use ncurses-libs, remove it. Add -ldl for the symbols dlclose, dlerror, dlopen... introduced from dso_dlfcn.c of libcrypto_static.a. Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
* | | Merge "Fix dhcpcd startup when net.hostname is not set"Elliott Hughes2013-01-071-1/+1
|\ \ \
| * | | Fix dhcpcd startup when net.hostname is not setMatt Gumbel2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 62d6f74 swapped p2p_interface and DHCP_CONFIG_PATH erroneously. This reverts them to their correct ordering and makes dhcpcd startup work again. Change-Id: Iea033a7e0dad98bb2a63fb39755330675cfbb0ab Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
* | | | Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"JP Abgrall2013-01-041-0/+6
|\ \ \ \
| * | | | init.rc: setup qtaguid group ownership of ctrl and stat filesJP Abgrall2013-01-041-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help get rid of android_aid.h in the kernel. The group of the proc entries will be used in place of the default values picked up by the xt_qtaguid netfilter module (AID_NET_BW_STATS, AID_NET_BW_ACCT). This change has no effect until the matching kernel changes are submitted. Change-Id: I3c177e7b5caf9c59300eba6bd4a976634b333674
* | | | Merge "ueventd: Increase uevent buffer size"jp abgrall2013-01-041-2/+2
|\ \ \ \
| * | | | ueventd: Increase uevent buffer sizeAndrew Boie2013-01-041-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it turns out, no, 64K is not enough. A device provisioning tool was generating many uevents as it manipulated the GPT, causing events near the end of the process (including events as a result of the final BLKRRPART ioctl()) to get lost. It's not clear what the best value for this should be, but increasing to 256K fixed the problem in this case. Change-Id: I4883b34e96c89e8a6fa581bc9cd121bb021b5694 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | Merge "Support adb client connect to remote server"jp abgrall2013-01-044-7/+73
|\ \ \ \ | |/ / / |/| | |
| * | | Support adb client connect to remote serverMatt Gumbel2013-01-044-7/+73
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADB client: allow user to specify hostname and port number of remote adb server. ADB server: bind server to all network interfaces instead of just localhost when user gives -a flag. Primary use-case for this change is to support remote testing of USB devices. HostA is running some test automation software which invokes adb client. HostB has USB-only device attached and is running adb server. adb client on HostA makes connection to adb server on HostB to talk to the USB device. Change-Id: I845cc8c00350b400317f8c18f813e6fd79bd5470 Signed-off-by: Dean Kwon <daex.i.kwon@intel.com> Signed-off-by: Jim Bride <jim.bride@intel.com> Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
* | | Merge "Include page protections in the debuggerd map output."Elliott Hughes2013-01-033-19/+28
|\ \ \ | |/ / |/| |
| * | Include page protections in the debuggerd map output.Elliott Hughes2013-01-033-19/+28
|/ / | | | | | | | | Bug: 7941716 Change-Id: I3bf475425c628c06f7799340c8a6132aab741742
* | Merge "Track the setsebool change in the emulator init.rc."Elliott Hughes2012-12-211-1/+1
|\ \
| * | Track the setsebool change in the emulator init.rc.Elliott Hughes2012-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | setsebool's syntax changed in November. This is the sole caller in AOSP. Change-Id: I0da608ee974bc3a9060372ef68a71c52726a44a6
* | | Merge "android_filesystem_config: allow absolute paths"Colin Cross2012-12-211-0/+4
|\ \ \ | |/ / |/| |
| * | android_filesystem_config: allow absolute pathsColin Cross2012-12-211-0/+4
|/ / | | | | | | | | | | | | SELinux policies use absolute paths, allow absolute paths in fs_config as well. Change-Id: Ic97ee0b4eb4df9eac965a8e819fde01df473de7e
* | Merge "Change setsebool syntax to be consistent with other init built-ins."Dima Zavin2012-12-184-48/+34
|\ \
| * | Change setsebool syntax to be consistent with other init built-ins.Stephen Smalley2012-12-134-48/+34
| |/ | | | | | | | | | | | | | | | | | | Change setsebool syntax from name=value to name value. This is to make it consistent with setprop and similar commands. Update both the init built-in command and the toolbox command for consistency. Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "libusbhost: generates a static library"Mike Lockwood2012-12-171-0/+10
|\ \
| * | libusbhost: generates a static libraryGuillaume Ranquet2012-12-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to limitations of the droidboot OS used for POS, there's a need for a static libusbhost library. this permits to include libusbhost in droidboot Change-Id: I0f0c07817ad19b773b466b69fd6e997877d41b34 Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
* | | Merge "libusbhost: permits client polling on inotify wd"Mike Lockwood2012-12-172-65/+118
|\ \ \ | |/ /
| * | libusbhost: permits client polling on inotify wdGuillaume Ranquet2012-12-102-65/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify libusbhost to expose the inotify watch descriptor to clients This modification permits clients to add the watch descriptor to their polling loop so that they don't have to use a dedicated thread only for libusbhost. Change-Id: I615bfcd56beab978135034b228d4d93337351eab Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com> Signed-off-by: Luc Piguet-Lacroix <lucx.piguet-lacroix@intel.com>
* | | Merge "adb: Improve ADB's forward redirection management."David 'Digit' Turner2012-12-133-33/+258
|\ \ \
| * | | adb: Improve ADB's forward redirection management.David 'Digit' Turner2012-11-263-33/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a few new options/modes to 'adb forward': adb forward --list adb forward --remove <local> adb forward --remove-all adb forward --no-rebind <local> <remote> For more context, see http://code.google.com/p/android/issues/detail?id=39631 Note that this only affects the host adb client and server programs, i.e. it's compatible with devices running older adbd versions. Change-Id: I9cda3ba12b5a8560a2061620bc7f948e5c1e70f7
* | | | Merge "Use Rlog instead of Log"Wink Saville2012-12-121-3/+14
|\ \ \ \
| * | | | Use Rlog instead of LogWink Saville2012-12-061-3/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Changing __android_log_write so the tag warns users relying on the tag to direct log output to the radio buffer to instead use Rlog or RLOG. Change-Id: I04b7bb5e620c1ab22b9b495382a252b539947e28
* | | | Merge "Add RLOGx"Wink Saville2012-12-121-1/+82
|\ \ \ \
| * | | | Add RLOGxWink Saville2012-12-061-1/+82
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will eventually allow us to remove the code in logd_write.c#__android_log_write which uses the tag to direct logs to the radio buffer. Change-Id: Ic992c0b8d1cf000b1814dc7786d2a40becf75eaf
* | | | Merge "libsysutils: Increase command buffersize and command args"Robert Greenwalt2012-12-112-4/+9
|\ \ \ \
| * | | | libsysutils: Increase command buffersize and command argsJosef Kindberg2012-11-122-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to support tethering of multiple remote Bluetooth devices. Change-Id: I9f736affd83226e8b2fa4f0faacd3654175dd8c9 Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com>
* | | | | Merge "Fix ELF header parser bug."Ben Cheng2012-12-101-4/+7
|\ \ \ \ \
| * | | | | Fix ELF header parser bug.Ben Cheng2012-12-101-4/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Program header size should be 32 instead of 40. Bug: 7696928 Change-Id: I8298a030790e9c28e8e8a0d2ad4e9ef294708eb6
* | | | | Merge "Expand crasher with a "thread-" prefix to crash on another thread."Elliott Hughes2012-12-101-11/+34
|\ \ \ \ \
| * | | | | Expand crasher with a "thread-" prefix to crash on another thread.Elliott Hughes2012-12-101-11/+34
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So "thread-nostack" runs the "nostack" code on a new thread, and "thread-abort" runs the "abort" code on a new thread, and so on. Bug: http://code.google.com/p/android/issues/detail?id=16672 Change-Id: I026a0e43eea147f1a7a74243846954599bcf4238
* | | | | Merge "Add missing signal codes to get_sigcode."Elliott Hughes2012-12-101-0/+25
|\ \ \ \ \
| * | | | | Add missing signal codes to get_sigcode.Elliott Hughes2012-12-101-0/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only common one we were missing is SI_TKILL, but we've had the full set on the dalvik-dev branch for some time now. Change-Id: I7cf52d352b8624e0adb17a2ed440e7a10f490dfd
* | | | | Merge "Fail-proof the inline directives for SMP atomic operations."Ben Cheng2012-12-074-89/+124
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fail-proof the inline directives for SMP atomic operations.Ben Cheng2012-12-074-89/+124
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various atomic operations are declared as inline in the header files to cut the function call overhead. However, the plain inline keyword is just a suggestion to the compiler which makes its own decision on whether to inline them or not. Worst, if they are not inlined, the -fvisibility-inlines-hidden compiler flag will render them as hidden symbols in the object file. If they are picked up by the linker over the ones supplied in libcutils.so the following warning will be reported: warning: hidden symbol 'android_atomic_inc' in foo.o is referenced by DSO bar.so One way is to add __attribute__((visibility("default"))) to those inline functions to suppress the linker warnings. A better way is to force inlining as with this patch. Change-Id: Ie4fcfdfaaf06f42d351619a0d89671a9df15ca2f
* | | | Merge "Fixed improper size displaying in 'df' utility"Elliott Hughes2012-12-031-5/+11
|\ \ \ \
| * | | | Fixed improper size displaying in 'df' utilityMichal Frynas2012-10-021-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'df' command used to display filesystem usage statistics as integer values, in most cases rounding the actual value down. Because of that 'df' tended to display faulty size values. This fix to 'df' utility calculates the fractional part of the size, then it rounds it when needed to the nearest one-digit integer value and displays after decimal dot. Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
* | | | | Merge "autosuspend_inited flag set even if initialization fails"Colin Cross2012-12-011-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | autosuspend_inited flag set even if initialization failsKyle Russell2012-11-201-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents possible SIGSEGV on second autosuspend_enable attempt when first intialization attempt fails. autosuspend_inited should only be set once autosuspend_ops has been assigned. Consider the first call to autosuspend_enable(). autosuspend_init() sets its inited flag to true, and attempts to set autosuspend_ops. If all the other autosuspend_*_init() attempts fail, autosuspend_init() returns -1, which autosuspend_enable() will return as a failure. A second call to autosuspend_enable() will check autosuspend_init() and see that autosuspend has already been initialized. It will attempt to access autosuspend_ops, which were not set in the first initialization attempt, causing a SIGSEGV. Change-Id: Ib2d3ee62fee4c3b6d0323e5b7f3709a23c6b923f
* | | | Merge "Switch keystore to binder"Kenny Root2012-11-271-1/+0
|\ \ \ \
| * | | | Switch keystore to binderKenny Root2012-11-131-1/+0
| |/ / / | | | | | | | | | | | | Change-Id: I1607bc1f14af5115cefd6727be3815cdcce670a8
* | | | Merge "Document the SELinux extensions to the Android init language."Kenny Root2012-11-271-0/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Document the SELinux extensions to the Android init language.Stephen Smalley2012-11-021-0/+26
| | |/ | |/| | | | | | | | | | Change-Id: I9b066e0789c93e5147c28a60baeed91c44dd9359 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>