Commit Graph

10170 Commits

Author SHA1 Message Date
Elliott Hughes 9464566580 am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
* commit 'f8acdcbe1103637c9d339bd9c954fb36e6785a74':
  Make sdcard log to the log rather than stderr.
2014-07-08 21:39:16 +00:00
Elliott Hughes f8acdcbe11 am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
* commit '75b7171fcb1a8f898ba533011ccb813792932e4c':
  Make sdcard log to the log rather than stderr.
2014-07-08 21:36:33 +00:00
Sreeram Ramachandran 85449d360f am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
  Create a data directory for netd and other network-related files.
2014-07-08 19:18:45 +00:00
Sreeram Ramachandran b12e40da25 am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
* commit '0a7b44d55b9e9d038de390457246ec7fd0999cad':
  Create a data directory for netd and other network-related files.
2014-07-08 19:14:36 +00:00
Sreeram Ramachandran 0a7b44d55b am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
* commit 'ab98d2e6a9392e0481dc9cf246b378072d37e95b':
  Create a data directory for netd and other network-related files.
2014-07-08 19:11:29 +00:00
Elliott Hughes 81542db7c2 am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
  Fix LP64 tombstone.cpp build failure.
2014-07-08 18:45:30 +00:00
Elliott Hughes f761709a8e am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
* commit '1829b14cd5887d510d8aedfc1a5b9fa636219525':
  Fix LP64 tombstone.cpp build failure.
2014-07-08 18:43:12 +00:00
Elliott Hughes 1829b14cd5 am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
* commit '18e754eebd3d3252e122034c46023df915dd89f6':
  Fix LP64 tombstone.cpp build failure.
2014-07-08 18:40:07 +00:00
Elliott Hughes 850903371f am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
* commit '4f27968f988808c713564de99c04612b9e8768b9':
  Improving maps output.
2014-07-08 18:21:45 +00:00
Elliott Hughes 4f27968f98 am 494bd36d: am dda63545: Merge "Improving maps output."
* commit '494bd36d463eeae6398ee340872e6356e498396d':
  Improving maps output.
2014-07-08 18:16:10 +00:00
Elliott Hughes 494bd36d46 am dda63545: Merge "Improving maps output."
* commit 'dda635455fb085d2f33fd1bdc5140805a055ea05':
  Improving maps output.
2014-07-08 18:11:54 +00:00
Nick Kralevich c87237f5af Merge "restorecon_recursive /cache" 2014-07-08 18:09:01 +00:00
Nick Kralevich e1695914d5 restorecon_recursive /cache
Make sure all files / directories within /cache are properly
labeled, not just the directory itself.

Addresses the following denial:

  type=1400 audit(0.0:26): avc: denied { getattr } for comm="Thread-85" path="/cache/lost+found" dev="mmcblk0p27" ino=11 scontext=u:r:untrusted_app:s0 tcontext=u:object_r:unlabeled:s0 tclass=dir

Change-Id: I5937b30043efeb696ffaa77258b7294d20d1494e
2014-07-09 12:40:13 -07:00
Elliott Hughes 75b7171fcb Merge "Make sdcard log to the log rather than stderr." 2014-07-08 18:09:01 +00:00
Elliott Hughes 300d564980 Make sdcard log to the log rather than stderr.
Change-Id: I9c78941184c5e364055bfac766e1e542d3c23c87
2014-07-08 13:53:26 -07:00
Eric Laurent aecb7f84cf Merge "Revert "Revert "sound trigger: several data structure updates""" 2014-07-08 18:08:48 +00:00
Eric Laurent 81c006d792 Revert "Revert "sound trigger: several data structure updates""
This reverts commit 6ef7c14b02.

Change-Id: I285b8388e7fd6f697b76fd18697edea7368991bb
2014-07-08 11:48:15 -07:00
Elliott Hughes 18e754eebd Merge "Fix LP64 tombstone.cpp build failure." 2014-07-08 17:33:52 +00:00
Elliott Hughes 7e775952e1 Fix LP64 tombstone.cpp build failure.
Change-Id: Id071417f56dd883e9d2e38a6f3296cb23a0352fb
2014-07-08 11:35:58 -07:00
dcashman 9f3a11edde am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
  Remove sshd.
2014-07-08 15:19:50 +00:00
dcashman cddb15b8a9 am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
* commit 'b4e74db79c9fda5e63ae49f299df3c0dd80a87f9':
  Remove sshd.
2014-07-08 15:13:30 +00:00
dcashman b4e74db79c am 3fa71b8e: Merge "Remove sshd."
* commit '3fa71b8e83dfc074b7628052ee6fd18d9e2290d0':
  Remove sshd.
2014-07-08 15:08:11 +00:00
Doug Zongker 4b39c6aca9 fix windows build
Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
2014-07-07 15:28:58 -07:00
Colin Cross 6d6a898b0c adb: fix 64-bit build
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.

Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
2014-07-07 14:13:30 -07:00
Nick Kralevich 4ef159a3c7 am 7367ecbc: am 06023134: am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
* commit '7367ecbc4839e3a608ab9b7742c659b58065209f':
  ueventd fixup_sys_perms: fixup SELinux labels unconditionally
2014-07-07 20:05:16 +00:00
Nick Kralevich 7367ecbc48 am 06023134: am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
* commit '060231346b9901f28ee8692518bcbc059e5777ca':
  ueventd fixup_sys_perms: fixup SELinux labels unconditionally
2014-07-07 19:59:26 +00:00
Nick Kralevich 060231346b am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
* commit '8022ce1e8742fc21aa0f4653d905c5a404b941dc':
  ueventd fixup_sys_perms: fixup SELinux labels unconditionally
2014-07-07 19:54:02 +00:00
Mark Salyzyn 9a357b884f am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
* commit 'badc23f847d40b9b076818550bf5ef6272a8010e':
  logcat: parse failure for -n <KBsize> and -r <rotate limit>
2014-07-07 18:14:49 +00:00
Mark Salyzyn badc23f847 am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
* commit 'f6ef1f53ac1b4dd659d23f418042db8dd556b9c2':
  logcat: parse failure for -n <KBsize> and -r <rotate limit>
2014-07-07 18:10:49 +00:00
Nick Kralevich 8022ce1e87 Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally" 2014-07-07 18:07:41 +00:00
Nick Kralevich 3b4c0bda07 ueventd fixup_sys_perms: fixup SELinux labels unconditionally
Currently, the fixup code in fixup_sys_perms() scans through all
entries in uevent*.rc. If it finds a match, then it performs a fixup.
If there's no match in that file, no fixup is performed.

SELinux file labels are independently stored in /file_contexts,
with no relationship to the files in /ueventd.rc. Even when no
entries exist in ueventd.rc, we still want to fixup the SELinux
file label in /sys when a uevent message occurs.

Change-Id: I0ccb5395ec0be9282095b844a5022e8c0d8903ac
2014-07-07 11:14:59 -07:00
Elliott Hughes dda635455f Merge "Improving maps output." 2014-07-07 18:07:41 +00:00
Brigid Smith 8606eaa770 Improving maps output.
Maps output now displays fault address location more intelligently.  If
the fault is not in a mapped region, it now shows where that address is
with respect to the other maps.

In addition, the size of the map is now printed as part of the output.

Also, crasher now supports an "mmap" option which mmaps/munmaps a region
of memory and then attempts to access it, causing a fault address in
between mapped regions that can be used to test that new part of the
maps output.

Change-Id: Ia5e1926802bdfcbbdb7857e3631ddf395ae0c5b8
2014-07-08 10:53:49 -07:00
dcashman 3fa71b8e83 Merge "Remove sshd." 2014-07-07 18:07:41 +00:00
dcashman b4cbff47ad Remove sshd.
This may require changes to other code, such as fastbootd, which relies on this
service.  sshd is not currently, used, however, so this change will force any
such code to be changed.

Bug: 11594902
Change-Id: I07e52008290dab5825be2ad062cbe730fa7dff71
2014-07-07 23:42:15 +00:00
Mark Salyzyn f6ef1f53ac Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>" 2014-07-07 17:50:18 +00:00
Mark Salyzyn 0b2dac4f3f logcat: parse failure for -n <KBsize> and -r <rotate limit>
Bug: https://code.google.com/p/android/issues/detail?id=72867
Change-Id: Id0c988543ecfccc5054d15d4195ef578468d50af
2014-07-07 18:04:32 +00:00
Nick Kralevich 14253c1aab Merge "init.rc: add seclabel to flash_recovery" 2014-07-07 17:47:39 +00:00
Nick Kralevich a1d97e5d1c init.rc: add seclabel to flash_recovery
Make sure flash_recovery is always running in the
install_recovery SELinux domain.

Change-Id: I9495eedd03f6b5dfcf2e78c03d1102f6032b327a
2014-07-08 12:41:16 -07:00
Doug Zongker 7df14ef339 Merge "add sideload-host mode to adb" 2014-07-07 17:47:39 +00:00
Mark Salyzyn 42461b7a59 am 9a357b88: am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
* commit '9a357b884fcc46f10f16860987614a2b9b610208':
  logcat: parse failure for -n <KBsize> and -r <rotate limit>
2014-07-07 18:22:43 +00:00
Eric Laurent 6ef7c14b02 Revert "sound trigger: several data structure updates"
This reverts commit 135dd2ee3d.

Change-Id: Iad97090c77ad36567eb3c6550ebe3812768e88ad
2014-07-07 16:43:45 +00:00
Doug Zongker 71fe584a1a add sideload-host mode to adb
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer.  It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.

If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.

Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
2014-07-07 07:51:58 -07:00
Eric Laurent 135dd2ee3d sound trigger: several data structure updates
Added sound model implementor UUID.
Added capture preamble duration in recognition event.
Replaced number of users by list of user IDs in key phrase
descriptor.
Report confidence level for each user with user ID in recognition
event.
Added more configuration data to start_recognition() grouped in a
recognition configuration structure.
- List of keyphrases to listen to
- Recognition mode
- List of users with min confidence level
Added definitions for sound model load callback event.

Bug: 12378680.
Change-Id: Ia8c12ab20448b702d13db964bdd90ac4117a58d7
2014-07-06 16:03:42 -07:00
Eric Laurent db37858a17 sound trigger: add sound model and key phrase IDs.
Bug: 12378680.
Change-Id: I93b1916151108ccf6eb625b0078e6ed574720b76
2014-07-06 10:44:18 -07:00
Elliott Hughes 6e141aea18 Merge "Fix sdcard's FUSE_FSYNCDIR handling." 2014-07-05 03:01:43 +00:00
Elliott Hughes f6d6737529 Fix sdcard's FUSE_FSYNCDIR handling.
For a file the FUSE fh is a struct handle containing an int fd;
for a directory it's a struct dirhandle containing a DIR*. Fix
handle_fsync to extract the file descriptor appropriately in
both cases.

Bug: 14613980
Change-Id: I45515cff6638e27a99b849e6fc639d355dbb4d27
2014-07-08 14:38:26 -07:00
Nick Kralevich 019b8ece22 am e73fc3ab: am 039b9cef: am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"
* commit 'e73fc3ab65e2db62da2e3d11c711068fdb811773':
  logd_write: set SOCK_CLOEXEC on socket
2014-07-03 16:09:56 +00:00
Nick Kralevich e73fc3ab65 am 039b9cef: am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"
* commit '039b9cef807b278a49815bcfe10389fe6efa5c82':
  logd_write: set SOCK_CLOEXEC on socket
2014-07-03 16:05:18 +00:00
Nick Kralevich 039b9cef80 am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"
* commit '5529de0fa3f41edb72737b00be13ef77b33d0a2b':
  logd_write: set SOCK_CLOEXEC on socket
2014-07-03 16:00:25 +00:00