Commit graph

15552 commits

Author SHA1 Message Date
Andres Morales
db100ff076 am 7f270fa8: am 3c2086da: [gatekeeperd] clear state and mark on cold boot
* commit '7f270fa8a18c86b8d5451dfcd8936c79115440ef':
  [gatekeeperd] clear state and mark on cold boot
2015-06-24 18:52:51 +00:00
Andres Morales
7f270fa8a1 am 3c2086da: [gatekeeperd] clear state and mark on cold boot
* commit '3c2086dabdb87e027412bb4405279128a321e184':
  [gatekeeperd] clear state and mark on cold boot
2015-06-24 18:33:14 +00:00
Evgenii Stepanov
c25f0dc38b am c7b86c16: am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS"
* commit 'c7b86c1661c7d178784dc2b9f09e478569a2886c':
  SANITIZE_TARGET: set global ASAN_OPTIONS
2015-06-24 18:30:03 +00:00
Evgenii Stepanov
c7b86c1661 am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS"
* commit 'eaa978768beef315c5dca9db964d4e80c462cf74':
  SANITIZE_TARGET: set global ASAN_OPTIONS
2015-06-24 18:12:24 +00:00
Evgenii Stepanov
eaa978768b am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS"
* commit '2e8d31f6a16819870c26e428098ccd3f32b2b466':
  SANITIZE_TARGET: set global ASAN_OPTIONS
2015-06-24 17:58:46 +00:00
Evgenii Stepanov
2e8d31f6a1 Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 2015-06-24 17:48:54 +00:00
Andres Morales
3c2086dabd [gatekeeperd] clear state and mark on cold boot
required to initialize state by certain HAL impls

Bug: 22011857
Change-Id: Ibb01a799da983e1a930aae946c331b23f571861d
2015-06-24 10:22:45 -07:00
Elliott Hughes
f1ed47e302 am 48815967: am 28369a2d: am dc80d03e: Merge "Move fastboot to C++."
* commit '4881596789e54b4bb38dc5cb195b7e67b4c88b92':
  Move fastboot to C++.
2015-06-24 04:59:11 +00:00
Elliott Hughes
4881596789 am 28369a2d: am dc80d03e: Merge "Move fastboot to C++."
* commit '28369a2d8ab7e011952afb6964c81407bd81a128':
  Move fastboot to C++.
2015-06-24 04:45:49 +00:00
Elliott Hughes
28369a2d8a am dc80d03e: Merge "Move fastboot to C++."
* commit 'dc80d03eab1ec5dd300a2a0ee2aa207f67e2ef33':
  Move fastboot to C++.
2015-06-24 04:34:40 +00:00
Elliott Hughes
dc80d03eab Merge "Move fastboot to C++." 2015-06-24 04:23:29 +00:00
Elliott Hughes
b3748de33f Move fastboot to C++.
Minimal conversion.

Change-Id: I32cbf125be481a8757720d10fa303c38a7fd5e38
2015-06-23 20:56:01 -07:00
Andres Morales
991680bf60 am 343d7082: am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev
* commit '343d708234636d505653d4ed1c9104463db76bab':
  [gatekeeperd] invalidate stale password cache
2015-06-23 22:21:15 +00:00
Andres Morales
343d708234 am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev
* commit 'b2856ddbd3555ccffa704496293497f091c2237e':
  [gatekeeperd] invalidate stale password cache
2015-06-23 21:05:56 +00:00
Andres Morales
b2856ddbd3 Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev 2015-06-23 18:41:38 +00:00
Andres Morales
9ea9a06b06 [gatekeeperd] invalidate stale password cache
password may change offline, invalidate the cache if it is
stale

Bug: 22019187
Change-Id: I2aaae978c8bd4629a0f93df3778d8679ae9b53d5
2015-06-23 11:29:57 -07:00
Sasha Levitskiy
2770d65f35 am 7f48db40: am fbf61b1f: Merge "Fingerprint: Safeguard against empty paths." into mnc-dev
* commit '7f48db407edd9b5dbaf83dd5b06a09822412ec2f':
  Fingerprint: Safeguard against empty paths.
2015-06-23 05:38:45 +00:00
Sasha Levitskiy
7f48db407e am fbf61b1f: Merge "Fingerprint: Safeguard against empty paths." into mnc-dev
* commit 'fbf61b1f761618af83c82a3a61f2bff81a66fbf8':
  Fingerprint: Safeguard against empty paths.
2015-06-23 03:20:24 +00:00
Pavlin Radoslavov
a88a084e94 am 233286f4: am 4caa9f39: Merge "Fix the file permissions of /data/misc/bluedroid/bt_config.conf" into mnc-dev
* commit '233286f40bdd84ad26b5ebf615d9f62fc30e19bf':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf
2015-06-23 01:39:01 +00:00
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
Sasha Levitskiy
fbf61b1f76 Merge "Fingerprint: Safeguard against empty paths." into mnc-dev 2015-06-23 00:20:42 +00:00
Tim Murray
0ace5f20f4 am f7180d1d: am 98c6de69: Merge "Don\'t set cgroup policy when updating cpusets." into mnc-dev
* commit 'f7180d1d2d2c30dfdfa50358fcfe1c698ef96e20':
  Don't set cgroup policy when updating cpusets.
2015-06-22 22:23:04 +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
Andres Morales
0fdae23b53 am 1e8a4588: am 835d96ea: [gatekeeperd] handle upgrades from software version to HAL
* commit '1e8a4588346bfaf1bb8f2c909e95669e29bd0d6e':
  [gatekeeperd] handle upgrades from software version to HAL
2015-06-22 21:56:41 +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
Sasha Levitskiy
99115b9148 Fingerprint: Safeguard against empty paths.
Bug 21930029

Change-Id: I116f4ec333d25406ba811fec7331cbf9ff1a4027
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-22 13:16:51 -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
c5b8743ff6 am b58866fb: am c7ab1e81: [gatekeeperd] add fast path for SW password verification
* commit 'b58866fbec93d6469f578c668a037738eefe5759':
  [gatekeeperd] add fast path for SW password verification
2015-06-22 20:08:51 +00: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
18cf0215b0 am 390c1203: am 1cddc209: Ignore ro.adb.secure in user builds.
* commit '390c1203145121497256d12ea99da61483933e8b':
  Ignore ro.adb.secure in user builds.
2015-06-19 21:36:09 +00: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
5c912e8630 am 2f031481: am 11e6f219: am 21ba889a: Merge "Ignore ro.adb.secure in user builds."
* commit '2f031481862e61eaa7d692cb525210997d7b3705':
  Ignore ro.adb.secure in user builds.
2015-06-19 21:06:29 +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
Evgenii Stepanov
1cbe3d944a SANITIZE_TARGET: set global ASAN_OPTIONS
allow_user_segv_handler=1 is required to run ART under ASan
detect_odr_violation=0 and alloc_dealloc_mismatch=0 suppress some of
the existing bug reports during boot.

Bug: 21951850, 21785137
Change-Id: I4d36967c6d8d936dacbfdf1b94b87fa94766bd3e
2015-06-19 11:15:51 -07:00
Mike Lockwood
d0a88d70c2 am 0882d3a1: am 6ee7ff42: Merge "libusbhost: Fix problem reading USB string descriptors on some quirky devices" into mnc-dev
* commit '0882d3a1d4b408b78d60664179ef7f9656aaf654':
  libusbhost: Fix problem reading USB string descriptors on some quirky devices
2015-06-19 14:11:21 +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
e322225c86 am 7cba8665: am 8d855ba9: am d2e7f002: Merge "init/util.cpp: don\'t return a negative unsigned value"
* commit '7cba86656964f464c7500809c81bcb52f15b6759':
  init/util.cpp: don't return a negative unsigned value
2015-06-19 03:57:53 +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