Commit graph

4119 commits

Author SHA1 Message Date
Benoit Goby
64b7c2cca0 am aeceb517: adb: Fix adb tcpip command
* commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7':
  adb: Fix adb tcpip command
2012-06-12 16:43:48 -07:00
Benoit Goby
aeceb51745 adb: Fix adb tcpip command
When running "adb tcpip 5555", adb create a service socket named
"tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if
we enable exit_on_close.

Bug: 6650130
Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3
2012-06-12 16:14:58 -07:00
Geremy Condra
d3eb825c4e Merge "Added logtags for errors in bionic." 2012-06-12 15:36:49 -07:00
Jamie Gennis
c06be8a15d am 1e96e16f: am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '1e96e16f81ce46adf5329b1db4662b53b927d4e2':
  Enable tracing on user builds
2012-06-12 13:05:49 -07:00
Jamie Gennis
1e96e16f81 am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea':
  Enable tracing on user builds
2012-06-12 12:41:25 -07:00
The Android Automerger
26ef0f99cd merge in jb-release history after reset to jb-dev 2012-06-12 11:25:53 -07:00
Jean-Baptiste Queru
60f3d65c83 am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
  toolbox: rmmod: fix module unloading
2012-06-11 15:28:12 -07:00
Jean-Baptiste Queru
2a2e10fbb3 am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
  toolbox: rmmod: fix module unloading
2012-06-11 15:25:44 -07:00
Jean-Baptiste Queru
16d2b6ae40 am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64':
  toolbox: rmmod: fix module unloading
2012-06-11 15:23:56 -07:00
Jean-Baptiste Queru
91e5551f88 Merge "toolbox: rmmod: fix module unloading" 2012-06-11 15:16:07 -07:00
Iliyan Malchev
a745aeb821 remove an anonymous typedef
Change-Id: I49eab23cde88e8640c188626d9413269c6eef88f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-06-11 14:18:45 -07:00
Iliyan Malchev
497de83856 HACK: push ramdisk up by 2M
Change-Id: Idb71ebd25c0b8c765ce8767961f362f6deb45547
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-06-11 14:18:45 -07:00
Iliyan Malchev
029d44e6ae HACK: use /firmware/image as a 3rd choice
Change-Id: I74af2e2dc872f88b904ead13e300ae32547e70c8
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-06-11 14:18:45 -07:00
Iliyan Malchev
db7462f8d1 libnl_2: compile as shared library as well
Change-Id: I103155b08a16b512a582ee2c4ffc9d6f8a1e1c6a
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-06-11 14:18:45 -07:00
Geremy Condra
e2c01bc7b9 Added logtags for errors in bionic.
Specifically, this adds tags for errors in FORTIFY_SOURCE'd parts
of bionic and for some indications of DNS spoofing.

Change-Id: I186ee36ae42cb6ba4fd5729ede84e2dcd4a56468
2012-06-11 12:22:37 -07:00
Jamie Gennis
0f3974c3d0 Merge "Enable tracing on user builds" into jb-dev 2012-06-11 12:04:27 -07:00
The Android Open Source Project
ef9d8d9b0c am a6f4e65b: Reconcile with jb-release
* commit 'a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd':
2012-06-11 09:25:45 -07:00
The Android Open Source Project
a6f4e65bc4 Reconcile with jb-release
Change-Id: Ic8df0fdb3f0a3e9eb54bbd37a929b04c394beb28
2012-06-11 09:22:54 -07:00
The Android Automerger
7452db9890 merge in jb-release history after reset to jb-dev 2012-06-11 07:05:20 -07:00
Jeff Brown
d010d7df29 am f87d9c86: am 9cec175c: Remove a stray newline in the backtrace output.
* commit 'f87d9c86982f8873b7f449029d702ba33569e629':
  Remove a stray newline in the backtrace output.
2012-06-08 15:33:30 -07:00
Jeff Brown
f87d9c8698 am 9cec175c: Remove a stray newline in the backtrace output.
* commit '9cec175c66100d9edbb1054f3f2977a5c3f80af2':
  Remove a stray newline in the backtrace output.
2012-06-08 15:30:33 -07:00
Jeff Brown
aff4466118 am 536b81af: resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp
* commit '536b81afed42ba6be1f824cf90d9a1e17a913c9c':
  Enhance native stack dumps.
2012-06-08 15:30:28 -07:00
Jeff Brown
536b81afed resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp
Change-Id: Idfef8c26b7a9e1a1a202e21dc5d34022bbaa92cc
2012-06-08 15:27:01 -07:00
Jamie Gennis
1279013dee Enable tracing on user builds
This change adds init.rc steps to:
 * allow kernel tracing to be enabled via adb
 * allow a limited set of kernel trace events to be enabled via adb
 * allow the kernel trace to be read via adb
 * allow all users to write to the kernel trace from userland

Bug: 6513400
Change-Id: Ic3c189b5697aa5edf88d2f507c932971bed6caff
2012-06-08 14:26:29 -07:00
Jeff Brown
9cec175c66 Remove a stray newline in the backtrace output.
Bug: 6615693
Change-Id: I1ac1746286afb77c3f5c4042c4592333ebb08a51
2012-06-08 14:21:51 -07:00
Colin Cross
38547c3a54 Merge "libsuspend: always unblock early suspend" 2012-06-08 14:14:20 -07:00
Jeff Brown
053b865412 Enhance native stack dumps.
Provides a new mechanism for dumpstate (while running as root)
to request that debuggerd dump the stacks of native processes that
we care about in bug reports.  In this mode, the backtrace
is formatted to look similar to a Dalvik backtrace.

Moved the tombstone generating code into a separate file to
make it easier to maintain.

Fixed a bug where sometimes the stack traces would be incomplete
because we were not waiting for each thread to stop after issuing
PTRACE_ATTACH, only the main thread.  So sometimes we were missing
traces for some threads.

Refactored the logging code to prevent accidentally writing data
to logcat when explicitly dumping a tombstone or backtrace from the
console.

Only root or system server can request to dump backtraces but
only root can dump tombstones.

Bug: 6615693
Change-Id: Ib3edcc16f9f3a687e414e3f2d250d9500566123b
2012-06-08 13:29:23 -07:00
Colin Cross
2146b7f2d7 libsuspend: always unblock early suspend
SurfaceFlinger and PowerManagerService manage their synchronization
without the help of early suspend, and SurfaceFlinger no longer unblocks
early suspend.  Add a new thread when early suspend is detected that will
immediately unblock early suspend.

Change-Id: I87ef4984a2ab34cbbb3af8b7762236b9a92dc2ea
2012-06-07 17:15:17 -07:00
JP Abgrall
51d827aab0 Merge "fastboot: Let "fastboot devices" work in all cases" 2012-06-07 09:32:53 -07:00
The Android Open Source Project
3b8f00c9d3 am d96544ff: Reconcile with jb-release
* commit 'd96544ff69601fe2990245e10e054480f0bd341f':
2012-06-07 07:55:49 -07:00
The Android Open Source Project
d96544ff69 Reconcile with jb-release
Change-Id: Ida4b92a5bf99e33e3162186f823b410317d9f6b1
2012-06-07 07:51:38 -07:00
Arve Hjønnevåg
6ba76f0190 Merge "init.rc: Set owner for /sys/power/autosleep" 2012-06-06 16:42:07 -07:00
Benoit Goby
c29569c5d3 Merge "FunctionFS: initial implementation" 2012-06-06 15:51:07 -07:00
JP Abgrall
a032dedefe fastboot: Let "fastboot devices" work in all cases
Ignore ANDROID_SERIAL when requesting to list devices, or else it is
impossible to list devices without unsetting the env var. Even
  ANDROID_SERIAL=  fastboot devices
or
  fastboot -s "" devices
won't work.

Change-Id: Ie92f35bda852c6ecea4ebaefb75b8f18c10b6d0c
2012-06-06 11:53:33 -07:00
Scott Anderson
845f106a93 am 1b7a7e81: adb: Use bionic\'s strtok_r() for Windows
* commit '1b7a7e81195ff06a7482f81cb92b094bb3481cb1':
  adb: Use bionic's strtok_r() for Windows
2012-06-05 18:17:37 -07:00
Scott Anderson
1b7a7e8119 adb: Use bionic's strtok_r() for Windows
A recent change use strtok_r which broke the Windows build.
Clear this potential landmine by adding adb_strtok_r to sysdeps.h
in the typical fashion.  For Windows, the actual implementation
in sysdeps_win32.c was copied from bionic/libc/string/strtok.c.

Change-Id: Ibb71555bc429f7058c07c3d39e0b62859c79635c
Signed-off-by: Scott Anderson <saa@android.com>
2012-06-05 17:54:27 -07:00
Scott Anderson
dd32794a29 am 866b1bd5: fastboot: Make the format of "devices -l" match adb\'s
* commit '866b1bd5051db4f22b634df1f8a06bc1c9aa2e26':
  fastboot: Make the format of "devices -l" match adb's
2012-06-05 16:21:04 -07:00
Scott Anderson
0e9e13eb46 am 2ca3e6b3: adb: Generalizing -s to take qualifiers.
* commit '2ca3e6b35f79136418ebc32fef57580698dbd045':
  adb: Generalizing -s to take qualifiers.
2012-06-05 16:21:04 -07:00
Scott Anderson
3fef581bc7 am e82c2db0: adb: Transmit key properties in banner of connect message
* commit 'e82c2db05cae70a0490a1f84b7211ef42c329671':
  adb: Transmit key properties in banner of connect message
2012-06-05 16:21:03 -07:00
Scott Anderson
866b1bd505 fastboot: Make the format of "devices -l" match adb's
Change-Id: Iec7b02fee8298a4437d1827623e9f61688a73f42
Signed-off-by: Scott Anderson <saa@android.com>
2012-06-05 11:13:45 -07:00
Scott Anderson
2ca3e6b35f adb: Generalizing -s to take qualifiers.
Prior to this change, -s could take either a serial number or a
device path (e.g. "-s 01498B1F02015015" or "-s usb:1-4.2").  This
change extends -s to also allow product, model or device names
(e.g. "-s product:mysid").  These new qualifiers will only be
available on devices that are running an adb daemon that provides
properties in the connect message per Change-Id:
    I09200decde4facb8fc9b4056fdae910155f2bcb9

The product, model and device are derived from the
ro.product.name, ro.product.model and ro.product.device
properties respectively.  They are prefixed with "product:",
"model:" or "device:" as appropriate.  In addition, any
non-alphanumerics in the model are changed to underscores.

If the -s parameter matches multiple devices, the result will be
the same as when multiple devices are connected but no -d, -e or
-s option is specified.  In general, this means the user will get
"error: more than one device".  However for get-state,
get-devpath and get-serialno, they will get "unknown".

The format of "devices -l" was changed to list all of the
qualifiers that are available.  The following example output
(with the last digits of the serial numbers replaced with X's) is
with a Galaxy Prime with an older adb daemon and another Galaxy
Prime and Galaxy S both with the enhanced adb daemons:

List of devices attached
016B75D60A0060XX       device usb:2-5 product:mysid model:Galaxy_Nexus device:toro
3731B535FAC200XX       device usb:1-4.2 product:soju model:Nexus_S device:crespo
01498B1F020150XX       device usb:1-4.1

Note that the serial number and state are now column oriented
instead of tab delimited.  After the serial number and state, all
qualifiers are listed with each preceded by a space.  The output
of the original devices command (without -l) is unchanged.

Change-Id: Iceeb2789874effc25a630d514a375d6f1889dc56
Signed-off-by: Scott Anderson <saa@android.com>
2012-06-05 11:13:40 -07:00
Scott Anderson
e82c2db05c adb: Transmit key properties in banner of connect message
protocol.txt says that the connect message should have three
fields:

        <systemtype>:<serialno>:<banner>

In reality, what is transmitted is simply:

        <systemtype>::

The serialno is obtained via other means so doesn't really need
to be a part of the connect message.  This change puts the
ro.product.name, ro.product.model and ro.product.device
properties in the <banner> for devices.  Each property is
terminated by a semicolon (;) with the key and value separated by
an equals sign (=).  Example message:

device::ro.product.name=<prd>;ro.product.model=<mdl>;ro.product.device=<dev>;

Making this change will enable the device list to provide more
information to the user and to give the potential for being able
to select which device to talk to with the -s option.

Change-Id: I09200decde4facb8fc9b4056fdae910155f2bcb9
Signed-off-by: Scott Anderson <saa@android.com>
2012-06-05 11:04:55 -07:00
Dima Zavin
ba4cf5d099 am 779b12fc: am 5f2d00b0: rootdir: init.rc: remove audio app/sys groups, merge to fg
* commit '779b12fc3511bd241c206a49e85ec1b19fdd681c':
  rootdir: init.rc: remove audio app/sys groups, merge to fg
2012-06-05 09:54:57 -07:00
Dima Zavin
7fa30fb0ab am 2b628a3c: am 29319a67: cutils: sched_policy: remove audio app/sys groups, merge into fg
* commit '2b628a3c2ee7d8411b76d37c3db30a0b7da24d73':
  cutils: sched_policy: remove audio app/sys groups, merge into fg
2012-06-05 09:54:57 -07:00
Dima Zavin
ed60e86a1a am 38160c06: am df44b886: core: init.rc: create apps cgroup for fg tasks, move bg under it
* commit '38160c06cabe35330f49eb0f6e0cfcc3f9823f0d':
  core: init.rc: create apps cgroup for fg tasks, move bg under it
2012-06-05 09:54:56 -07:00
Dima Zavin
1a0b4c44ac am 2449c83a: am 13ed76bf: cutils: sched_policy: make bg group be nested under fg
* commit '2449c83a09fe1a5b87f89bd55925a11e79efb2ef':
  cutils: sched_policy: make bg group be nested under fg
2012-06-05 09:54:56 -07:00
The Android Automerger
e545c5341f merge in jb-release history after reset to jb-dev 2012-06-05 06:59:47 -07:00
Dima Zavin
779b12fc35 am 5f2d00b0: rootdir: init.rc: remove audio app/sys groups, merge to fg
* commit '5f2d00b0677cbe9ad42ea0394def0a51aef7bdda':
  rootdir: init.rc: remove audio app/sys groups, merge to fg
2012-06-05 00:33:34 -07:00
Dima Zavin
2b628a3c2e am 29319a67: cutils: sched_policy: remove audio app/sys groups, merge into fg
* commit '29319a6753569fb3ef160c2de2f1c4d9d1398178':
  cutils: sched_policy: remove audio app/sys groups, merge into fg
2012-06-05 00:33:33 -07:00
Dima Zavin
38160c06ca am df44b886: core: init.rc: create apps cgroup for fg tasks, move bg under it
* commit 'df44b88621f60e933d7d31090bf0bb892e88142c':
  core: init.rc: create apps cgroup for fg tasks, move bg under it
2012-06-05 00:33:31 -07:00