Commit Graph

5479 Commits

Author SHA1 Message Date
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
Nick Kralevich ef854b6256 am a078c0e0: am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
* commit 'a078c0e0e1ce4dd8aaad8704add4b2ad4040dc06':
  run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 14:35:06 -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 a9ea0249a0 am e4e16d0c: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e4e16d0cfbc8799f2c2ba6c500465668c192f23f':
2013-03-29 09:54:39 -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
Benoit Goby 5e61ab0d77 Merge "toolbox: Make reboot a separate command from toolbox" 2013-03-29 03:14:27 +00:00
Geremy Condra 9a84b553e8 am 83f9cdf0: am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
* commit '83f9cdf0c8a374f98593440b07d0688b2fb91997':
  run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:36:36 -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 15311e0830 am 38e1bb86: am 774f9299: libcutils: add support for app tracing
* commit '38e1bb8617ee6b7913b9b7b7c40e43338ea5c947':
  libcutils: add support for app tracing
2013-03-28 14:04:50 -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
Geremy Condra c8df252fa1 Merge "run-as: Get seinfo from packages.list and pass to libselinux." 2013-03-28 20:30:57 +00:00
The Android Automerger d982d29dc2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-28 05:56:36 -07:00
Robert Craig fced3ded83 run-as: Get seinfo from packages.list and pass to libselinux.
Change allows the proper seinfo value to be passed
to libselinux to switch to the proper app security
context before running the shell.

Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 06:04:39 -04:00
Geremy Condra b9cbdbafda am a9d7c529: am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'a9d7c5296fe31a9481fc3217066ae7fd1d850a06':
  Drop /data/system as a policy file location
2013-03-27 17:13:15 -07:00
Geremy Condra a9d7c5296f am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'de97f798a1c24303de35ff44e2f47b590b46a815':
  Drop /data/system as a policy file location
2013-03-27 17:11:02 -07:00
Geremy Condra de97f798a1 am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'bed08333d921e97bc60b81c0f183816386709d79':
  Drop /data/system as a policy file location
2013-03-27 16:42:21 -07:00
Geremy Condra bed08333d9 am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'c0e1bc1c755b165574c761e878b6fc26fb340ba0':
  Drop /data/system as a policy file location
2013-03-27 16:40:25 -07:00
Geremy Condra c0e1bc1c75 Merge "Drop /data/system as a policy file location" 2013-03-27 22:39:47 +00:00
William Roberts 04561b6347 Drop /data/system as a policy file location
/data/system is no longer used as a policy
file location. Use /data/security instead.

Change-Id: Ie77be9e25c67c8a2157c7b6c468f3215a49ead52
2013-03-26 23:33:18 +00:00
Benoit Goby c6d7e200ed toolbox: Make reboot a separate command from toolbox
Set the CAP_SYS_BOOT filesystem capability on the new reboot
command and keep CAP_SYS_BOOT in adb bounding set so that the
shell user can run it.

Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
2013-03-26 12:24:10 -07:00
The Android Open Source Project f798f300f3 am 540c9fba: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '540c9fbaf58593e2d9046efd6a29caff6af0e77b':
2013-03-26 12:17:45 -07:00
Benoit Goby 82075a4044 Merge "toolbox: Fix rm -f with multiple files" 2013-03-26 19:16:23 +00:00
The Android Open Source Project 540c9fbaf5 Reconcile with jb-mr2-release - do not merge
Change-Id: I2a7a7aed31eaf87aac6359a320d4b8c3f3d6b034
2013-03-26 10:49:57 -07:00
The Android Automerger 584b332134 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:56:39 -07:00
Benoit Goby 391f365c6d toolbox: Fix rm -f with multiple files
Only check errno if unlink returns -1.
Continue instead of exiting if one file does not exist.

Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
2013-03-25 19:59:21 -07:00
Igor Murashkin df115f3386 am 858c8fe7: am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev
* commit '858c8fe7f98036a345a26dd710fbdad82357d201':
  Properly handle cases of multiple inotify events
2013-03-26 01:16:45 +00:00
Igor Murashkin 858c8fe7f9 am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev
* commit 'd118394d444107dba4430723d248863ff412c444':
  Properly handle cases of multiple inotify events
2013-03-26 01:14:42 +00:00
Igor Murashkin d118394d44 Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev 2013-03-26 01:12:44 +00:00
Todd Poynor d15715e5a0 am 40d313b4: am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy
* commit '40d313b49341973f4a188647e0e923a683346ddf':
  init.rc: Set owner/perm for interactive governor io_is_busy
2013-03-25 22:58:36 +00:00
Todd Poynor 40d313b493 am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy
* commit '6b5de1cda2e5c4946aa08a11a38ad0a7eee115ce':
  init.rc: Set owner/perm for interactive governor io_is_busy
2013-03-25 22:55:57 +00:00
Ziv Hendel f75ea8d082 Properly handle cases of multiple inotify events
Bug: 8469799
Change-Id: Ie10242dd05becd142cc84651d5e5795e4c02270d
Signed-off-by: Igor Murashkin <iam@google.com>
Signed-off-by: Adam Hampson <ahampson@google.com>
2013-03-25 14:12:18 -07:00
Todd Poynor 6b5de1cda2 init.rc: Set owner/perm for interactive governor io_is_busy
Change-Id: I7537d56a23ca787daf92a9d91778056f987097bd
2013-03-25 13:17:13 -07:00
The Android Automerger a797007bc1 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-25 05:57:00 -07:00
Geremy Condra a4d79d68ac am 746cde9a: am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit '746cde9a8c92a138f7a53b17728ecff5c48c9e4b':
  Fix mode on /data/security.
2013-03-23 03:59:27 +00:00
Geremy Condra 746cde9a8c am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit 'fb39c0d19860fe48bc598d5d180a8cce9f59e33b':
  Fix mode on /data/security.
2013-03-23 03:56:40 +00:00
Geremy Condra fb39c0d198 am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit '4d71493e74ed1ea39e554146351cc39e47cb5d02':
  Fix mode on /data/security.
2013-03-22 20:54:52 -07:00
Geremy Condra 4d71493e74 am e849970c: Merge "Fix mode on /data/security."
* commit 'e849970c5423cae43da1f7e2ab117117db6e0a64':
  Fix mode on /data/security.
2013-03-22 20:52:37 -07:00
Geremy Condra e849970c54 Merge "Fix mode on /data/security." 2013-03-23 02:47:16 +00:00
Ying Wang 504d2747bd am 85da9313: am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev
* commit '85da931345fd420bc2959d79361058efa974f465':
  android_filesystem_config: add /vendor
2013-03-22 16:01:42 +00:00
Ying Wang 85da931345 am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev
* commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8':
  android_filesystem_config: add /vendor
2013-03-22 15:59:31 +00:00
Ying Wang d0f3e8588a Merge "android_filesystem_config: add /vendor" into jb-mr2-dev 2013-03-22 15:57:59 +00:00
Rom Lemarchand dcf8b21eef am 9cb78cc3: am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev
* commit '9cb78cc3e1207544c6839ff3f78d266ae408a84b':
  liblogwrap: use POLLHUP flag to check when a child dies
2013-03-21 23:18:54 +00:00