Commit Graph

5479 Commits

Author SHA1 Message Date
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
The Android Automerger f2661be215 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-04 05:56:12 -07:00
The Android Open Source Project 7d960c9618 am a7672f42: Reconcile with jb-mr2-release - do not merge
* commit 'a7672f42478fae4150b32e5210fc6eb8f1b17bb1':
2013-04-03 18:05:31 -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 294c9ce217 am 76c67445: Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
* commit '76c674451c831c1e9c3e3ee134ea8af26ae19ac1':
  Add OkHttp to the boot classpath.
2013-04-03 14:12:25 -07:00
Geremy Condra 709928de49 am 977e1f26: am c1e47294: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
* commit '977e1f263cee9023baf12cb430b5547e415e763e':
  Give system ownership of selinux load and enforce files.
2013-04-03 14:12:23 -07:00
Geremy Condra 4042393454 am 5fa4d26c: am 8e15eabd: Apply the correct SELinux label for the properties workspace.
* commit '5fa4d26c572ca130f7c99040149e8aa7122888a5':
  Apply the correct SELinux label for the properties workspace.
2013-04-03 14:12:23 -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
Geremy Condra d701099cd1 Merge "Apply the correct SELinux label for the properties workspace." 2013-04-03 00:19:48 +00:00
Geremy Condra 78c8f3577e Apply the correct SELinux label for the properties workspace.
Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
2013-04-02 17:01:55 -07:00
Mathias Agopian c43d6185bd am 145d61e0: am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev
* commit '145d61e0c7f2584c65d6eb454496013408d707af':
  move tinyutils into its own namespace
2013-04-02 16:45:17 -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 Open Source Project be8892a33a am 9de1633b: Reconcile with jb-mr2-release - do not merge
* commit '9de1633b6bc8ed8bc324b0741209bdb73944048c':
2013-04-02 11:04:16 -07:00
Benoit Goby 05d6a649a3 am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev
* commit '9f25178a9dd0aa8fab5e74f785c9997ae230a325':
  adb: Prevent registering usb_disconnect twice
2013-04-02 11:03:18 -07:00
Christopher Tate 9ee72b0b16 am a72f0ff0: am ded2e5ac: debuggerd now notifies the Activity Manager about native crashes
* commit 'a72f0ff08376a2ebe6036869fb3144584fc4e395':
  debuggerd now notifies the Activity Manager about native crashes
2013-04-02 11:03:17 -07: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
James Sullins edee93dc5b toolbox/dmesg: do not hardcode KLOG_BUF_LEN
Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
2013-04-01 21:50:03 +05:30
The Android Automerger 73cf7bff51 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-01 05:56:35 -07:00
Hong-Mei Li 83a6d36d42 libsparse: Fix null pointer issue
Fix the issue that "out" pointer is dereferenced without checking.

Change-Id: I76a57ad7309841218231346f4807ef2be8628737
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2013-04-01 11:22:50 +08:00
Hong-Mei Li 11467189bc init: Fix potential null pointer issue
With the old strdup() mechanism, it may return NULL if insufficient memory was
available. So we check the return value or do not use strdup to avoid null
pointer issue.

Change-Id: Id684948d6cb6c2f06327f29a2ba692f9542fce80
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2013-04-01 11:17:51 +08:00
Geremy Condra ca203fc23e Give system ownership of selinux load and enforce files.
This is necessary to enable remote updates.

Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
2013-03-30 17:55:43 -07:00
Colin Cross b2ba42a5d3 am b1d20464: am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"
* commit 'b1d204648eb8061aa59bed189ce41938fa40197a':
  adb: Remove execute permission on usb_vendor.c
2013-03-29 17:58:46 -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 243667a98e am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp
* commit '78420edc0f3e99684c36f0d516744b4d9312a1c1':
  Add BYD's USB Vendor ID
  Add USB Vendor ID for Xiaomi
  Add vendor IDs to adb
2013-03-29 16:43:13 -07: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 6c11676e89 am 9c37960c: am 9b32f87a: Merge "Add Mips memset speedup"
* commit '9c37960cd9169c160d9865a6d63e256e125b4aae':
  Add Mips memset speedup
2013-03-29 16:13:41 -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