Commit Graph

4954 Commits

Author SHA1 Message Date
Benoit Goby 77e8e5851d adb: Add "unauthorized" connection state
Add a new connection state, so that devices, that require confirmation
to allow adb, appear as "unauthorized" in the adb devices lists.

Change-Id: Ib4264bc5736dedecf05bcf8e31896f4d7a91fad8
2013-01-15 17:21:13 -08:00
Benoit Goby 345cb066d2 adb: Read secure adb keys on every auth request
The framework can now clear the user key list, so we need to reload the
key list on every auth request instead of loading it once when adbd
starts.
This also fixes issues with encrypted devices, where the user key file
is only readable after the user has unlocked the device.

Change-Id: I350c5aab986f8ca86b95f316398d03012553e581
2013-01-15 17:16:22 -08:00
Elliott Hughes d984497a88 am 989c033b: am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '989c033bf3de0e81fbb9f4aad2a52d6e17093d8c':
  The localtime_tz and mktime_tz extensions are now in bionic.
2013-01-15 14:44:16 -08: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
Rom Lemarchand b58a822955 logwrapper: prevent logwrap from hanging when child dies
Sometimes the read on the PTY can wait indefinitely if the child
dies. By using a poll statement that monitors both the output
of the child and its state we prevent this from happening.

Change-Id: I51d5556c66f039bca673145ca72db262977e1689
2013-01-14 11:11:58 -08:00
Rom Lemarchand 1b325d1968 Merge "logwrapper: split into liblogwrap and the executable itself" 2013-01-11 18:58:54 -08:00
Robert Greenwalt c93d30f50d Merge "Support 4 dns servers, up from 2" 2013-01-11 15:38:59 -08:00
Rom Lemarchand 113bd47d61 logwrapper: split into liblogwrap and the executable itself
Abstracting the functionality of logwrapper into a library and making
use of it for the logwrapper executable.

Change-Id: I2bcf722413f3a8454c6f52137dec86c4477fb8b5
2013-01-11 13:58:29 -08:00
Alex Ray 60efde774d Merge "cutils: add simple reference counter" 2013-01-11 13:25:34 -08:00
Ying Wang 2c43b55814 resolved conflicts for merge of f62f1e3a to master
Change-Id: I35c66859e2c454c20c8acc6b2b1f0833032205bb
2013-01-10 15:35:05 -08:00
Alex Ray d874cc8bb9 cutils: add simple reference counter
Change-Id: Iefb34abc864cb4ca2da2f1c85c45f89af8c7fe8b
2013-01-10 15:23:55 -08:00
Robert Greenwalt fdd573188d Support 4 dns servers, up from 2
bug:5958524
Change-Id: I61c25e23d21e92653ec9b874d3d456a330d8fe05
2013-01-10 11:36:09 -08:00
Rom Lemarchand 7f213f878d Merge "Revert "Remove -d option from logwrapper"" 2013-01-10 09:42:12 -08:00
JP Abgrall 571c136768 adb: HACK: (linux only) allow temp mitigation for multithreaded issues
There are serious multithreading issues between the fdevent and transport
subsystems which both manipulate struct asocket and struct fde concurrently.
The prevalent symptom being around multiple socket closures which stomp
 on each other, typically causing:
   "glibc detected *** adb: double free or corruption ..."

This HACK allows forcing CPU affinity via an env var. E.g.:
  export ADB_CPU_AFFINITY_BUG6558362=0
which will cause ONLY the adb server and all its threads to be pegged
to CPU 0.

The result is visible in valgrind's helgrind: no *socket_close() related
data races. But tons of other races are still there.

Bug: 6558362
Change-Id: I0f112390a6a921c64b2a783297be9e99ce27fd56
2013-01-09 15:34:21 -08: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
Alex Ray 9067dd3aef Merge "cutils: bitops: add include for bool" 2013-01-07 17:04:20 -08:00
Alex Ray 81ec96df4f cutils: bitops: add include for bool
Change-Id: I3eca5a7c1f5ec66ded1229ccb6ca1dbb5d608ffd
2013-01-07 16:58:01 -08:00
Alex Ray b65bea46ad Merge "cutils: Add bitmask utilities to bitops" 2013-01-07 16:38:50 -08:00
Alex Ray 2111bc7b28 cutils: Add bitmask utilities to bitops
Bitmask utils handle resource tracking using a (multi-word) bitmask.

Change-Id: I2ae45df1ac8c665c29ea9cae32a757168686b96c
2013-01-07 13:02:28 -08:00
Elliott Hughes 273f504c14 am bab2ba3e: am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"
* commit 'bab2ba3e730d610883added31ff806da352cbb07':
  Fix dhcpcd startup when net.hostname is not set
2013-01-07 12:26:21 -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 a444041547 am ba900f2e: am fb69c2e2: Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"
* commit 'ba900f2e708f0b654cdaa827804cbb21af4e4fb4':
  init.rc: setup qtaguid group ownership of ctrl and stat files
2013-01-04 18:12:56 -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 c2b19de2ec am 3f8d6cde: am d084ec96: Merge "ueventd: Increase uevent buffer size"
* commit '3f8d6cded84bd526f7e648905565a1d262ca9906':
  ueventd: Increase uevent buffer size
2013-01-04 17:50:57 -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
Rom Lemarchand b10c7b4e3d Revert "Remove -d option from logwrapper"
This reverts commit 4d74bcf445

Change-Id: Ibcd19400cd2589b52df2b3acaba25f02676ba9e0
2013-01-04 16:21:14 -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 d7c52a458e am 03873ce4: am 77eccafe: Merge "Support adb client connect to remote server"
* commit '03873ce495e8c4bdb1289cdfa2b97cb47bb15108':
  Support adb client connect to remote server
2013-01-04 12:08:28 -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
Rom Lemarchand 875adfafe7 Merge "Remove -d option from logwrapper" 2013-01-03 16:05:02 -08:00
Elliott Hughes e8097be24e am a82985b6: am 7cd45071: Merge "Include page protections in the debuggerd map output."
* commit 'a82985b6686f8b47119193fee2f804376a90125b':
  Include page protections in the debuggerd map output.
2013-01-03 15:21:56 -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
Rom Lemarchand 4d74bcf445 Remove -d option from logwrapper
Removing the ability of logwrapper to die with a SIGSEGV at address
"return code from wait".

Change-Id: I563715db2b1e5e789af84190fc2ff78664d63572
2013-01-03 14:42:05 -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
Todd Poynor 2b5b3bb103 rootdir: init.rc: set perms for new interactive governor attrs
/sys/devices/system/cpu/cpufreq/interactive/timer_slack
/sys/devices/system/cpu/cpufreq/interactive/target_loads

Change-Id: Ia5d5c3d615ad64bab3a1317e5de2ac9a6d61679e
2013-01-02 15:05:33 -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 2bf496378d am e2aab2cc: am 38219ee6: Merge "Track the setsebool change in the emulator init.rc."
* commit 'e2aab2cce821149fcb807d4b67753c470a5f2028':
  Track the setsebool change in the emulator init.rc.
2012-12-28 09:48:25 -08:00
Colin Cross 8b9e9804f1 am 4600545f: am b8e86c5a: Merge "android_filesystem_config: allow absolute paths"
* commit '4600545fbb5b496297a51e43818b8b3e750590c5':
  android_filesystem_config: allow absolute paths
2012-12-28 09:47:48 -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