Commit Graph

15244 Commits

Author SHA1 Message Date
Pavlin Radoslavov 233286f40b am 4caa9f39: Merge "Fix the file permissions of /data/misc/bluedroid/bt_config.conf" into mnc-dev
* commit '4caa9f39bb3415358dcb737d0eb9058c34192806':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf
2015-06-23 01:31:49 +00:00
Tim Murray f7180d1d2d am 98c6de69: Merge "Don\'t set cgroup policy when updating cpusets." into mnc-dev
* commit '98c6de6926e65615caff5be72236a24339258dee':
  Don't set cgroup policy when updating cpusets.
2015-06-22 22:09:19 +00:00
Pavlin Radoslavov 4caa9f39bb Merge "Fix the file permissions of /data/misc/bluedroid/bt_config.conf" into mnc-dev 2015-06-22 22:03:20 +00:00
Tim Murray 98c6de6926 Merge "Don't set cgroup policy when updating cpusets." into mnc-dev 2015-06-22 21:31:14 +00:00
Andres Morales 1e8a458834 am 835d96ea: [gatekeeperd] handle upgrades from software version to HAL
* commit '835d96eae59aefeaa32fda3218246db51bf22fab':
  [gatekeeperd] handle upgrades from software version to HAL
2015-06-22 21:13:29 +00:00
Tim Murray 999102664c Don't set cgroup policy when updating cpusets.
bug 21782794

Change-Id: I3b2cf8ae4f3ed0c14f206584ae7fa2b1a1d11ad0
2015-06-22 14:00:56 -07:00
Andres Morales 835d96eae5 [gatekeeperd] handle upgrades from software version to HAL
Certain devices, like Shamu, are currently running an interim
software-only gatekeeper. When the HAL for those devices is merged,
we need to handle upgrading to the HAL smoothly.

Bug: 21090356
Change-Id: I5352bc547a43671a08249eae532e8b3ce6b90087
2015-06-22 13:12:41 -07:00
Andres Morales b58866fbec am c7ab1e81: [gatekeeperd] add fast path for SW password verification
* commit 'c7ab1e81776876d226174248593c6d0f2a65892b':
  [gatekeeperd] add fast path for SW password verification
2015-06-22 19:57:04 +00:00
Andres Morales c7ab1e8177 [gatekeeperd] add fast path for SW password verification
Bug: 21445004
Change-Id: I5e36ddbefaf1fa8de8623858fd785ac8fb651a4f
2015-06-22 12:05:57 -07:00
Pavlin Radoslavov 8175bb2352 Fix the file permissions of /data/misc/bluedroid/bt_config.conf
Fix the file access permissions and group ownership of
"/data/misc/bluedroid/bt_config.conf" so the file can be reused when
switching users on the device.
For that purpose, we need to do the following:

1. Set the set-group-ID (bit 02000) flag for directory "/data/misc/bluedroid"
   so the files created in that directory will have group-id of
   "net_bt_stack" .

2. Change the file's permissions of file "/data/misc/bluedroid/bt_config.conf"
   to Read/Write by User and Group.

Bug: 21493919
Change-Id: Ie00ab4695198ef2aa299b484ef9d4f17bd41b98a
2015-06-22 10:19:30 -07:00
Elliott Hughes 390c120314 am 1cddc209: Ignore ro.adb.secure in user builds.
* commit '1cddc2092f544c5eac339e59746436facfdd5dc7':
  Ignore ro.adb.secure in user builds.
2015-06-19 21:23:04 +00:00
Elliott Hughes 2f03148186 am 11e6f219: am 21ba889a: Merge "Ignore ro.adb.secure in user builds."
* commit '11e6f219e7c5b755c70979fb573fcdc607d0f118':
  Ignore ro.adb.secure in user builds.
2015-06-19 20:54:26 +00:00
Elliott Hughes 11e6f219e7 am 21ba889a: Merge "Ignore ro.adb.secure in user builds."
* commit '21ba889aded6167859c88f51dec54838b8e407a1':
  Ignore ro.adb.secure in user builds.
2015-06-19 20:36:46 +00:00
Elliott Hughes 1cddc2092f Ignore ro.adb.secure in user builds.
Require authorization by default, and remove the ability to override
that in user builds. (userdebug and eng are still free to do whatever
they want.)

Bug: http://b/21862859
Change-Id: Ibf8af375be5bf1141c1ad481eee7a59fb10a7adb
(cherry picked from commit 5cba504215)
2015-06-19 13:26:02 -07:00
Elliott Hughes 21ba889ade Merge "Ignore ro.adb.secure in user builds." 2015-06-19 20:24:19 +00:00
Mike Lockwood 0882d3a1d4 am 6ee7ff42: Merge "libusbhost: Fix problem reading USB string descriptors on some quirky devices" into mnc-dev
* commit '6ee7ff426893d8b8ebbb63e02073b9780912bd17':
  libusbhost: Fix problem reading USB string descriptors on some quirky devices
2015-06-19 13:56:31 +00:00
Nick Kralevich 7cba866569 am 8d855ba9: am d2e7f002: Merge "init/util.cpp: don\'t return a negative unsigned value"
* commit '8d855ba983d7e794fd75a20557ee92f4f8db2465':
  init/util.cpp: don't return a negative unsigned value
2015-06-19 03:46:48 +00:00
Nick Kralevich 8d855ba983 am d2e7f002: Merge "init/util.cpp: don\'t return a negative unsigned value"
* commit 'd2e7f0021dbf3f1f301f1e268820952c8a80f2e3':
  init/util.cpp: don't return a negative unsigned value
2015-06-19 03:34:09 +00:00
Nick Kralevich d2e7f0021d Merge "init/util.cpp: don't return a negative unsigned value" 2015-06-19 03:24:17 +00:00
Nick Kralevich d2104df69b init/util.cpp: don't return a negative unsigned value
android_name_to_id() returns -1U on error, which causes a
crash when the following clang options are enabled:

  -fsanitize=signed-integer-overflow,unsigned-integer-overflow
  -ftrap-function=abort
  -fsanitize-undefined-trap-on-error

Rather than returning a negative unsigned value (which doesn't
make a lot of sense, IMHO), return a positive unsigned value.

While we're here, add logging on decode_uid failures.

Bug: 21880301
Change-Id: I652e4c1daa07c7494cceca2b4e1656b9158f2604
2015-06-18 20:11:06 -07:00
Mike Lockwood 6ee7ff4268 Merge "libusbhost: Fix problem reading USB string descriptors on some quirky devices" into mnc-dev 2015-06-18 22:24:42 +00:00
Mike Lockwood 0dd1aab7b5 libusbhost: Fix problem reading USB string descriptors on some quirky devices
Some devices fail to send USB string descriptors if you attempt to read more
than 255 bytes

Bug: 21871761
Change-Id: Id5b8865179f80523f0ad5b6028d49dd99db2b36b
2015-06-18 13:38:31 -07:00
Elliott Hughes 5cba504215 Ignore ro.adb.secure in user builds.
Require authorization by default, and remove the ability to override
that in user builds. (userdebug and eng are still free to do whatever
they want.)

Bug: http://b/21862859
Change-Id: Ibf8af375be5bf1141c1ad481eee7a59fb10a7adb
2015-06-18 10:19:30 -07:00
Erik Kline 5be9e1cd1b am 60adb5fa: Merge "Qualify IPv6 link-local DNS servers with an interface name" into mnc-dev
* commit '60adb5fac864d05f19c6ae5e6295578749427ff3':
  Qualify IPv6 link-local DNS servers with an interface name
2015-06-18 09:48:21 +00:00
Erik Kline 60adb5fac8 Merge "Qualify IPv6 link-local DNS servers with an interface name" into mnc-dev 2015-06-18 08:35:30 +00:00
Erik Kline ba48ff7a59 Qualify IPv6 link-local DNS servers with an interface name
Bug: 21562630
Bug: 21764392
Change-Id: I7d271ae0f3fd92f70049017d38ccc15e3c1dda83
2015-06-18 15:44:41 +09:00
Elliott Hughes 4ed1b7b4b4 am e79d0d55: init support for cgroups.
* commit 'e79d0d556f894696291cef89ccaf64efe45d11ad':
  init support for cgroups.
2015-06-17 22:43:47 +00:00
Elliott Hughes be6a2a69b8 am f5a7ba9e: am 53d504f0: Merge "init support for cgroups."
* commit 'f5a7ba9eedb0cdca0198f44811f9aff092a54c7d':
  init support for cgroups.
2015-06-17 22:42:50 +00:00
Elliott Hughes f5a7ba9eed am 53d504f0: Merge "init support for cgroups."
* commit '53d504f00dea232601e1290c8255274afb0f4256':
  init support for cgroups.
2015-06-17 22:31:21 +00:00
Elliott Hughes e79d0d556f init support for cgroups.
This adds the "writepid" option that instructs init to write the child's
pid to the given filenames (such as /dev/cpuctl/bg_non_interactive/cgroup.procs
and/or /dev/cpuset/foreground/cgroup.procs).

Bug: http://b/21163745
Change-Id: I121bb22aa208bc99c4fb334eb552fdd5bcc47c1a
(cherry picked from commit d62f0608d9)
2015-06-17 15:21:52 -07:00
Elliott Hughes 53d504f00d Merge "init support for cgroups." 2015-06-17 22:20:38 +00:00
Elliott Hughes d62f0608d9 init support for cgroups.
This adds the "writepid" option that instructs init to write the child's
pid to the given filenames (such as /dev/cpuctl/bg_non_interactive/cgroup.procs
and/or /dev/cpuset/foreground/cgroup.procs).

Bug: http://b/21163745
Change-Id: I121bb22aa208bc99c4fb334eb552fdd5bcc47c1a
2015-06-17 14:42:40 -07:00
Nick Kralevich 2f2e6cd078 am 4c6269ce: am 106f92f5: Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS""
* commit '4c6269ce280f33c7d080dbdbbfd3a8d9681d85ed':
  Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
2015-06-17 00:09:45 +00:00
Nick Kralevich 4c6269ce28 am 106f92f5: Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS""
* commit '106f92f5c8f116acf8ba01090aab30ad57d0fed8':
  Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
2015-06-16 23:56:34 +00:00
Nick Kralevich 106f92f5c8 Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"" 2015-06-16 23:47:39 +00:00
Nick Kralevich 21d605eff5 Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
Shamu boots, but hammerhead doesn't. Likely cause is this change.

This reverts commit 18ae44bf3d.

Bug: 21880301
Change-Id: I490816060209c15aa07c783d05fe5b141c7c9023
2015-06-16 23:35:37 +00:00
Yusuke Sato 2b4edce148 am d5039305: processgroup: change the polling interval for killProcessGroup()
* commit 'd50393057a6551c3bb498ed3a3bb7bd9eeb48225':
  processgroup: change the polling interval for killProcessGroup()
2015-06-16 22:36:04 +00:00
Yusuke Sato d50393057a processgroup: change the polling interval for killProcessGroup()
to make the function faster on average. Since killing a process
takes about 40-60ms on a recent device, the previous logic tends
to sleep too long. This CL does not significantly change the total
timeout (old code: 204ms, new code: 200ms).

Bug: 21813611
Change-Id: Ica44b2437ccccaebadcf585d7a09d993ce71a499
2015-06-16 13:59:32 -07:00
Nick Kralevich 1bc2b09fd3 am 135b6b08: am 6b27b7d6: Merge "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit '135b6b08cd9fec32c266f3981d4af101f6e270f9':
  init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-16 20:58:27 +00:00
Nick Kralevich 135b6b08cd am 6b27b7d6: Merge "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit '6b27b7d60850433d1d6a3395f9569ea0f5f78634':
  init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-16 20:44:43 +00:00
Nick Kralevich 6b27b7d608 Merge "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS" 2015-06-16 20:36:49 +00:00
Nick Kralevich 18ae44bf3d init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS
Call abort() if an integer overflow or underflow occurs.
See https://android-review.googlesource.com/154831

Change-Id: Icb6bdef55a5899144351b56d683f34f5da32a88d
2015-06-15 20:37:09 -07:00
Mark Salyzyn 68054b545e am 4c62736a: am 3a7d4b4e: Merge "logd: missing klogd content"
* commit '4c62736a5d3432533ec4c2dacd5443fb1c353f23':
  logd: missing klogd content
2015-06-15 21:40:55 +00:00
Mark Salyzyn 8697b0f986 am d5600fd4: logd: missing klogd content
* commit 'd5600fd40fac5e90532ea08e22940965cfdd7710':
  logd: missing klogd content
2015-06-15 21:40:36 +00:00
Mark Salyzyn 4c62736a5d am 3a7d4b4e: Merge "logd: missing klogd content"
* commit '3a7d4b4e2a4c221eacc2826c3261894bbb5faba2':
  logd: missing klogd content
2015-06-15 21:32:41 +00:00
Mark Salyzyn d5600fd40f logd: missing klogd content
(cherry pick from commit ee49c6a670)

- regression in log_strtok_r (part deux) In commit
      'logd: fix kernel logline stutter'
  2c3b300fd8 we introduced log_strtok_r.
  as a replacement for strtok_r that dealt with a problem with
  some kernel log messages. Fix is to refine definition of
  is_timestamp to not match on patterns like [0], requiring
  a single period. Another fix is to refine definition of
  is_prio to properly escape non-digit content.
- Missing content because SYSLOG_ACTION_SIZE_BUFFER with added logging
  is too short for full read of SYSLOG_ACTION_READ_ALL dropping
  initial content. Add a margin for additional 1024 bytes.
- Absolute _first_ log entry has sequence number of 1, which is
  specifically dropped, start sequence count at 1 rather than 0.
- Remove trailing space for efficiency.
- If tag exists but no content, trick into kernel logging.

Bug: 21851884
Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a23
2015-06-15 14:22:02 -07:00
Mark Salyzyn 3a7d4b4e2a Merge "logd: missing klogd content" 2015-06-15 21:20:47 +00:00
Mark Salyzyn ee49c6a670 logd: missing klogd content
- regression in log_strtok_r (part deux) In commit
      'logd: fix kernel logline stutter'
  2c3b300fd8 we introduced log_strtok_r.
  as a replacement for strtok_r that dealt with a problem with
  some kernel log messages. Fix is to refine definition of
  is_timestamp to not match on patterns like [0], requiring
  a single period. Another fix is to refine definition of
  is_prio to properly escape non-digit content.
- Missing content because SYSLOG_ACTION_SIZE_BUFFER with added logging
  is too short for full read of SYSLOG_ACTION_READ_ALL dropping
  initial content. Add a margin for additional 1024 bytes.
- Absolute _first_ log entry has sequence number of 1, which is
  specifically dropped, start sequence count at 1 rather than 0.
- Remove trailing space for efficiency.
- If tag exists but no content, trick into kernel logging.

Bug: 21851884
Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a23
2015-06-15 21:19:10 +00:00
Nick Kralevich ba2c2a8c70 am cb2d0c5a: am 7015b3be: Merge "TypeHelpers.h: Don\'t underflow unsigned int"
* commit 'cb2d0c5aadd2c8e979d696c0bbdc6783067f1c76':
  TypeHelpers.h: Don't underflow unsigned int
2015-06-15 17:51:29 +00:00
Nick Kralevich cb2d0c5aad am 7015b3be: Merge "TypeHelpers.h: Don\'t underflow unsigned int"
* commit '7015b3be5392043ca32f05aa51631dbec0a058d5':
  TypeHelpers.h: Don't underflow unsigned int
2015-06-15 17:38:38 +00:00