Commit graph

4722 commits

Author SHA1 Message Date
Colin Cross
5fc4fdc6a0 am 2447afdb: Merge "fastboot: use better exported api from libext4_utils"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '2447afdb9ee2607b932805bd2efd8006242f4d62':
  fastboot: use better exported api from libext4_utils
2013-01-23 17:35:20 -08:00
Colin Cross
2447afdb9e Merge "fastboot: use better exported api from libext4_utils" 2013-01-24 00:55:08 +00:00
Colin Cross
2aaf5e84f0 fastboot: use better exported api from libext4_utils
Switch fastboot to use an exported api from libext4_utils that
will change less often, and remove some of the implementation
details from fastboot.

Change-Id: I85a10c8f58abe8093d0c781e1a0e100c348ef0d9
2013-01-23 15:43:41 -08:00
David Turner
3dbcb6d6c6 am 98d07897: Merge "Windows adb: Make client stdout and stderr handles uninheritable"
* commit '98d0789772b94b9b0c2aecfab74dc1a9283a91b1':
  Windows adb: Make client stdout and stderr handles uninheritable
2013-01-21 02:51:40 -08:00
David Turner
98d0789772 Merge "Windows adb: Make client stdout and stderr handles uninheritable" 2013-01-21 10:16:54 +00:00
Elliott Hughes
989c033bf3 am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '026b3953d4471cd43c850ee72bbca7cc77e87a34':
  The localtime_tz and mktime_tz extensions are now in bionic.
2013-01-15 14:33:22 -08:00
Elliott Hughes
026b3953d4 Merge "The localtime_tz and mktime_tz extensions are now in bionic." 2013-01-15 13:21:55 -08:00
Elliott Hughes
def8d6a706 The localtime_tz and mktime_tz extensions are now in bionic.
(cherry-pick of d03072ffde. 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
2013-01-15 11:34:08 -08:00
Ray Donnelly
267aa8b00e Windows adb: Make client stdout and stderr handles uninheritable
Change-Id: Ib0519a199c9504aad1d0ecc3757f4d162984bf22
2013-01-08 23:02:28 +00:00
Ying Wang
f62f1e3a07 am ef2ea99b: Merge "Correct LOCAL_LDLIBS of adb"
* commit 'ef2ea99bfe1e19c451882c3c8eb19368d0087ff6':
  Correct LOCAL_LDLIBS of adb
2013-01-08 15:00:41 -08:00
Ying Wang
ef2ea99bfe Merge "Correct LOCAL_LDLIBS of adb" 2013-01-08 13:56:07 -08:00
Elliott Hughes
bab2ba3e73 am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"
* commit '6d9589c33517c024ab992d1e2c1b8efd1b51e366':
  Fix dhcpcd startup when net.hostname is not set
2013-01-07 12:18:35 -08:00
Elliott Hughes
6d9589c335 Merge "Fix dhcpcd startup when net.hostname is not set" 2013-01-07 11:06:24 -08:00
JP Abgrall
ba900f2e70 am fb69c2e2: Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"
* commit 'fb69c2e2577e056bb7a054343a9f6d781cedbf3d':
  init.rc: setup qtaguid group ownership of ctrl and stat files
2013-01-04 18:08:24 -08:00
JP Abgrall
fb69c2e257 Merge "init.rc: setup qtaguid group ownership of ctrl and stat files" 2013-01-04 17:50:18 -08:00
jp abgrall
3f8d6cded8 am d084ec96: Merge "ueventd: Increase uevent buffer size"
* commit 'd084ec96b6b9cde311a4283a5f9121a1034de166':
  ueventd: Increase uevent buffer size
2013-01-04 15:49:11 -08:00
JP Abgrall
3e54aabc63 init.rc: setup qtaguid group ownership of ctrl and stat files
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
2013-01-04 15:31:20 -08:00
jp abgrall
d084ec96b6 Merge "ueventd: Increase uevent buffer size" 2013-01-04 15:30:50 -08:00
jp abgrall
03873ce495 am 77eccafe: Merge "Support adb client connect to remote server"
* commit '77eccafe55e019089c18273c1062df262220ab83':
  Support adb client connect to remote server
2013-01-04 12:03:55 -08:00
Andrew Boie
d562ca78aa ueventd: Increase uevent buffer size
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>
2013-01-04 11:37:34 -08:00
jp abgrall
77eccafe55 Merge "Support adb client connect to remote server" 2013-01-04 11:27:20 -08:00
Matt Gumbel
d7b3308511 Support adb client connect to remote server
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>
2013-01-04 11:00:38 -08:00
Matt Gumbel
ba2ba5c011 Fix dhcpcd startup when net.hostname is not set
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>
2013-01-04 10:18:45 -08:00
Elliott Hughes
a82985b668 am 7cd45071: Merge "Include page protections in the debuggerd map output."
* commit '7cd450719a78b6079d30608473cb36d7e4be2cb9':
  Include page protections in the debuggerd map output.
2013-01-03 15:15:47 -08:00
Elliott Hughes
7cd450719a Merge "Include page protections in the debuggerd map output." 2013-01-03 14:52:35 -08:00
Elliott Hughes
d1420be613 Include page protections in the debuggerd map output.
Bug: 7941716
Change-Id: I3bf475425c628c06f7799340c8a6132aab741742
2013-01-03 13:39:57 -08:00
Chih-Wei Huang
9c60755207 Correct LOCAL_LDLIBS of adb
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
2013-01-01 15:57:40 +08:00
Elliott Hughes
e2aab2cce8 am 38219ee6: Merge "Track the setsebool change in the emulator init.rc."
* commit '38219ee6116943269b0501a1a0210c76e2ba69c3':
  Track the setsebool change in the emulator init.rc.
2012-12-21 18:15:01 -08:00
Elliott Hughes
38219ee611 Merge "Track the setsebool change in the emulator init.rc." 2012-12-21 17:19:37 -08:00
Elliott Hughes
334ad0ed49 Track the setsebool change in the emulator init.rc.
setsebool's syntax changed in November. This is the sole
caller in AOSP.

Change-Id: I0da608ee974bc3a9060372ef68a71c52726a44a6
2012-12-21 14:45:27 -08:00
Colin Cross
4600545fbb am b8e86c5a: Merge "android_filesystem_config: allow absolute paths"
* commit 'b8e86c5aba4d160d1d356883a6a9a85056c5fa47':
  android_filesystem_config: allow absolute paths
2012-12-21 14:44:23 -08:00
Colin Cross
b8e86c5aba Merge "android_filesystem_config: allow absolute paths" 2012-12-21 13:35:05 -08:00
Colin Cross
04aaf5a424 android_filesystem_config: allow absolute paths
SELinux policies use absolute paths, allow absolute paths in fs_config
as well.

Change-Id: Ic97ee0b4eb4df9eac965a8e819fde01df473de7e
2012-12-21 12:51:17 -08:00
Todd Poynor
191af2f2c3 am 367f1e4b: am 4f247d75: rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
* commit '367f1e4b0aaaf7f725e686b5b40845cbb5c07a42':
  rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
2012-12-20 15:42:59 -08:00
Todd Poynor
367f1e4b0a am 4f247d75: rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
* commit '4f247d753a8865cd16292ff0b720b72c28049786':
  rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
2012-12-20 15:40:34 -08:00
Todd Poynor
4f247d753a rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
Change-Id: I09b9a1ed548e4ffe1232f583e8ff5f026760f616
2012-12-19 18:15:03 -08:00
Dima Zavin
7ec62dbd9d am 82ea44f8: Merge "Change setsebool syntax to be consistent with other init built-ins."
* commit '82ea44f88fed158fd807ef5b79100295b1163941':
  Change setsebool syntax to be consistent with other init built-ins.
2012-12-19 09:46:39 -08:00
Dima Zavin
82ea44f88f Merge "Change setsebool syntax to be consistent with other init built-ins." 2012-12-18 23:42:09 -08:00
Jean-Baptiste Queru
22e9136661 Merge from AOSP staging branch
Change-Id: I28f72f7c361eaa4a0fae671e988b52708cb9e3af
2012-12-18 15:18:00 -08:00
Mike Lockwood
516943c0e9 Merge "libusbhost: generates a static library" 2012-12-17 14:34:53 -08:00
Mike Lockwood
dea9a93ddd Merge "libusbhost: permits client polling on inotify wd" 2012-12-17 14:34:20 -08:00
David 'Digit' Turner
abf7cc977e am 13306d95: Merge "adb: Improve ADB\'s forward redirection management."
* commit '13306d95f6b70b58bfdd3e1c6d9b1d2a49e6f175':
  adb: Improve ADB's forward redirection management.
2012-12-13 18:08:58 -08:00
Stephen Smalley
0e23fee505 Change setsebool syntax to be consistent with other init built-ins.
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>
2012-12-13 15:41:53 -05:00
David 'Digit' Turner
13306d95f6 Merge "adb: Improve ADB's forward redirection management." 2012-12-13 03:40:24 -08:00
Wink Saville
0c47c68258 am 81077e5f: Merge "Use Rlog instead of Log"
* commit '81077e5faeaa064478495ce0924e8249b04899fd':
  Use Rlog instead of Log
2012-12-12 08:48:13 -08:00
Wink Saville
0c457c0fff am bf866aed: Merge "Add RLOGx"
* commit 'bf866aeda1d01a8adbcbf186f9ff08418e45b836':
  Add RLOGx
2012-12-12 08:48:12 -08:00
Wink Saville
81077e5fae Merge "Use Rlog instead of Log" 2012-12-12 08:23:15 -08:00
Wink Saville
bf866aeda1 Merge "Add RLOGx" 2012-12-12 08:22:02 -08:00
Robert Greenwalt
8bc848d9b2 am abce9e85: Merge "libsysutils: Increase command buffersize and command args"
* commit 'abce9e85e406b7a6e4c8c36b8eaaac049a7e11a9':
  libsysutils: Increase command buffersize and command args
2012-12-11 16:54:14 -08:00
Robert Greenwalt
abce9e85e4 Merge "libsysutils: Increase command buffersize and command args" 2012-12-11 15:50:50 -08:00