Jeff Sharkey
c307aa5f03
am b4d52a43: Only handle keycodes when adb is enabled.
...
* commit 'b4d52a437e97489710182ebc6a8a3e00d6fbd6f0':
Only handle keycodes when adb is enabled.
2013-04-05 13:43:34 -07:00
Keun-young Park
ca02a13690
am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"
...
* commit 'ad999a09ab973c5ed5c54a78cdaa4dbc06eb485e':
rootdir: goldfish: mount debugfs on boot time
2013-04-05 10:09:24 -07:00
Keun-young Park
ad999a09ab
Merge "rootdir: goldfish: mount debugfs on boot time"
2013-04-05 16:19:20 +00:00
Geremy Condra
a7096004f2
am 911ba269: Merge "Add -i option to toolbox cmd ls"
...
* commit '911ba269e369035f9a4a250fa22233b37d724356':
Add -i option to toolbox cmd ls
2013-04-04 23:42:16 -07:00
Geremy Condra
911ba269e3
Merge "Add -i option to toolbox cmd ls"
2013-04-05 00:08:19 +00:00
Jeff Sharkey
b4d52a437e
Only handle keycodes when adb is enabled.
...
This prevents accidental bugreports on userdebug/eng devices.
Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
2013-04-04 10:46:33 -07:00
William Roberts
403b195548
Add -i option to toolbox cmd ls
...
Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
2013-04-03 17:39:19 -07:00
The Android Open Source Project
a7672f4247
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I1442a44754b64c868210578faf00006c5aaa6b58
2013-04-03 16:43:51 -07:00
Brian Carlstrom
76c674451c
Merge "resolved conflicts for merge of 02e8d730
to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
2013-04-03 21:05:34 +00:00
Geremy Condra
977e1f263c
am c1e47294: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
...
* commit 'c1e47294c9ca69f32bae24036eb0f19db3af7b2e':
Give system ownership of selinux load and enforce files.
2013-04-03 14:03:21 -07:00
Geremy Condra
5fa4d26c57
am 8e15eabd: Apply the correct SELinux label for the properties workspace.
...
* commit '8e15eabdc0b40e68426eaf3179dc076d20df75b6':
Apply the correct SELinux label for the properties workspace.
2013-04-03 14:03:21 -07:00
Brian Carlstrom
d3f0e0ae37
resolved conflicts for merge of 02e8d730
to jb-mr2-dev-plus-aosp
...
Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767
2013-04-03 14:03:13 -07:00
Geremy Condra
c1e47294c9
Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
2013-04-03 20:59:33 +00:00
Brian Carlstrom
02e8d73079
Merge "Add OkHttp to the boot classpath."
2013-04-03 20:15:20 +00:00
Geremy Condra
8e15eabdc0
Apply the correct SELinux label for the properties workspace.
...
Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
2013-04-03 11:59:56 -07:00
Geremy Condra
c2594f36e7
Give system ownership of selinux load and enforce files.
...
This is necessary to enable remote updates.
Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
2013-04-03 11:58:12 -07:00
The Android Automerger
f135302f31
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:03:00 -07:00
Mathias Agopian
145d61e0c7
am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev
...
* commit '69de9ac00bd3db3bfdb04ac5686e4b2cbfc372b5':
move tinyutils into its own namespace
2013-04-02 16:40:46 -07:00
jwilson
8637e8186a
Add OkHttp to the boot classpath.
...
Change-Id: I185b803b5b804ff8680ef928ce5163727adbf0bd
2013-04-02 16:23:48 -07:00
Mathias Agopian
69de9ac00b
Merge "move tinyutils into its own namespace" into jb-mr2-dev
2013-04-02 23:19:06 +00:00
The Android Automerger
74b6b3ca7f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:19:23 -07:00
The Android Open Source Project
9de1633b6b
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icffab869a16395b5985c14995d49333302f0bc0a
2013-04-02 08:39:51 -07:00
Benoit Goby
9f25178a9d
am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev
...
* commit '7f8fb3ffa2a234b704fc975fc9b1001f17df9cac':
adb: Prevent registering usb_disconnect twice
2013-04-02 08:24:36 -07:00
Christopher Tate
a72f0ff083
am ded2e5ac: debuggerd now notifies the Activity Manager about native crashes
...
* commit 'ded2e5acfcf0c705f08577d0ccb720bd5037f4ba':
debuggerd now notifies the Activity Manager about native crashes
2013-04-02 08:23:39 -07:00
Benoit Goby
7f8fb3ffa2
Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev
2013-04-02 01:44:50 +00:00
Benoit Goby
b66356cab6
adb: Prevent registering usb_disconnect twice
...
adbd can receive multiple AUTH_RSAPUBLICKEY packets. This happens for
example when booting with usb attached when we retry authenticating
after the framework is done booting. Make sure usb_disconnect is only
registered once, otherwise this creates a loop in the disconnects list.
Bug: 8504991
Change-Id: Ia1f9a37005dd17b7eefee1493d622e1679263eea
2013-04-01 17:39:06 -07:00
Mathias Agopian
9857d99eec
move tinyutils into its own namespace
...
I was fed-up with the constant conflicts in Eclipse
with the "libutils" version.
Also fix a few copyright notices.
Change-Id: I8ffcb845af4b5d0d178f5565f64dfcfbfa27fcd6
2013-04-01 16:50:43 -07:00
Christopher Tate
ded2e5acfc
debuggerd now notifies the Activity Manager about native crashes
...
The Activity Manager sets up a permission-guarded domain socket, which
debuggerd connects to when a crash happens. If this is successful,
the daemon then mirrors the logged crash report to that socket, then
closes it.
Bug 8322568
Change-Id: Ife0c772a628ef82e8457094e511ce1edbfe57460
2013-04-01 10:37:24 -07:00
The Android Automerger
73cf7bff51
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-01 05:56:35 -07:00
Colin Cross
b1d204648e
am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"
...
* commit 'f5562cb66c1c15d65bc372ede4c180430e1ce9d7':
adb: Remove execute permission on usb_vendor.c
2013-03-29 17:13:45 -07:00
Colin Cross
f5562cb66c
Merge "adb: Remove execute permission on usb_vendor.c"
2013-03-29 23:43:13 +00:00
Benoit Goby
f8cfa8a1e4
adb: Remove execute permission on usb_vendor.c
...
Change-Id: Ia4f2e0171634764bde3593593b3c99184236528f
2013-03-29 16:33:02 -07:00
Benoit Goby
78420edc0f
resolved conflicts for merge of 35200422
to jb-mr2-dev-plus-aosp
...
Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
2013-03-29 16:29:22 -07:00
Keun-young Park
9c37960cd9
am 9b32f87a: Merge "Add Mips memset speedup"
...
* commit '9b32f87a8c489a15baea535800b7c309014bd0ee':
Add Mips memset speedup
2013-03-29 16:09:10 -07:00
Colin Cross
352004220a
Merge changes I0694ed72,I9f0622e0,Ib8c5196c
...
* changes:
Add BYD's USB Vendor ID
Add USB Vendor ID for Xiaomi
Add vendor IDs to adb
2013-03-29 22:18:06 +00:00
sunxiaoqi
92eb583833
Add BYD's USB Vendor ID
...
Change-Id: I0694ed72d70638f0a4a252b1c802ae8f4e33385e
2013-03-29 14:57:44 -07:00
Gary Hua
d3b69404a1
Add USB Vendor ID for Xiaomi
...
Change-Id: I9f0622e05334a5074604bd88093172654b4c3e7d
Signed-off-by: Gary Hua <huachengping@xiaomi.com>
2013-03-29 14:56:53 -07:00
Sam Lin
df6d7666fd
Add vendor IDs to adb
...
Adding vendor IDs to adb for device partners:
AnyDATA, Harris & Oppo
Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
2013-03-29 14:51:15 -07:00
Keun-young Park
9b32f87a8c
Merge "Add Mips memset speedup"
2013-03-29 21:05:23 +00:00
Nick Kralevich
a078c0e0e1
am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
...
* commit 'd67bbab6d873c073fa5c3bdb93e8f32106898123':
run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:26:17 -07:00
Nick Kralevich
d67bbab6d8
am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
...
* commit 'a56b0b97ddd64a9558975c470ea6d09b4f10575e':
run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:21:55 -07:00
Nick Kralevich
a56b0b97dd
am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
...
* commit '191fe44c972e7f45f4bac1cee27522ae244da498':
run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:00:56 -07:00
The Android Open Source Project
e4e16d0cfb
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia1e9aa160247d491cc60c1dcc7a73c8545410d78
2013-03-29 09:49:30 -07:00
Nick Kralevich
191fe44c97
Merge "run-as: Don't require CAP_DAC_READ_SEARCH"
2013-03-29 16:24:06 +00:00
Nick Kralevich
b0f1540f2a
run-as: Don't require CAP_DAC_READ_SEARCH
...
This is a partial AOSP port of Google internal change
080427e4e2
.
Change-Id: I23a7edc808d227caf3862b035dc2ca39639d9d59
2013-03-29 08:55:06 -07:00
Geremy Condra
83f9cdf0c8
am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
...
* commit '46e8991209508a9f5d59bf97ed39b791444dbaf7':
run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:34:57 -07:00
Geremy Condra
46e8991209
am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
...
* commit 'f19e045c58dafbdc46e848ec5a5c935f472dea34':
run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:32:49 -07:00
Geremy Condra
f19e045c58
am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
...
* commit 'c8df252fa16d328be197ecc5280a2f8c2aacb5ad':
run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:30:36 -07:00
Jamie Gennis
38e1bb8617
am 774f9299: libcutils: add support for app tracing
...
* commit '774f9299912cdf9f2a6b3805bb557e30bafbad05':
libcutils: add support for app tracing
2013-03-28 14:02:55 -07:00
Jamie Gennis
774f929991
libcutils: add support for app tracing
...
This change adds support for tracing using the ATRACE_TAG_APP tag. This tag is
enabled only for processes in which the /proc/<pid>/cmdline value appears in
the comma-separated list of such values in the debug.atrace.app_cmdlines system
property. It is also only enabled if either the ro.debuggable system property
is set to 1 or the application has declared itself debuggable in its manifest,
which gets reported to libcutils by the framework.
Change-Id: Ic94ba55f4e70a9cf994056acbf151e523428b65d
2013-03-28 20:59:31 +00:00