GitLab

* commit '598e833d':
  fix double closing file descriptors

* commit 'b20d54b2':
  fix double closing file descriptors

Change-Id: I243628b77a0b7b138785167ccb5520e1a9374a78

Add support for keeping the keys in a separate file on another partition,
for devices with no space reserved for a footer after the userdata filesystem.

Add support for encrypting the volumes managed by vold, if they meet certain
criteria, namely being marked as nonremovable and encryptable in vold.fstab.
A bit of trickiness is required to keep vold happy.

Change-Id: Idf0611f74b56c1026c45742ca82e0c26e58828fe

Change-Id: I70f4170b78ed5412a4addd3c603c8ff52c8cfa0d

* commit '9496945d':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

* commit '4e00f1fa':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

am c13e0967: (-s ours) am 745ddcb2: DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.

* commit 'c13e0967':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.

am 7877388b: (-s ours) am f4cd1c6b: DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

* commit '7877388b':
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

am 745ddcb2: DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.

* commit '745ddcb2':
  DO NOT MERGE Only create android_secure mountpoint on the primary external storage volume.

am f4cd1c6b: DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

* commit 'f4cd1c6b':
  DO NOT MERGE Mount secondary external storage writable by AID_MEDIA_RW rather than AID_SDCARD_RW

Change-Id: If2532ce8ca7d584f2442d830450313198234bd23
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Id9a6fa6705cf97b94d419e85b5d74413e79fc748
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: If21d134e7d8333b8214603a2d43a3153ab8760cc
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Id65f76eacaec1787aa557f96447c5bc19b7b127f
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I1e434c5b47b40fabaf1e702d7f2e43a88c0497dc

am 3368f167: am 9cb6e501: Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change in internal tree.

* commit '3368f167':
  Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)

am 9cb6e501: Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change in internal tree.

* commit '9cb6e501':
  Set SO_PASSCRED on the uevent socket. (needed for change I393c21da)

in internal tree.

Change-Id: Ibdf7cf1e1d0ba177d9de813baa6481ddd31d5d9c

Change-Id: I09a8a6d7c654869a40339adce181e6b981f10369

* commit 'b510cd4e':
  vold: Enable the SO_PASSCRED socket option

* commit '77992e71':
  vold: Enable the SO_PASSCRED socket option

Ensure that sender credentials are available when we
receive a netlink message.

This is a manual cherry-pick of
c51920c8

Change-Id: I98aff8733449617d35d20bff2fe77e9d3f22f57e

* commit '46770e6e':
  vold: Enable the SO_PASSCRED socket option

* commit 'b9aa1459':
  vold: Enable the SO_PASSCRED socket option

Ensure that sender credentials are available when we
receive a netlink message.

Change-Id: I48411205a8fbc1ebd29834f64028662d80f15995

* commit 'c51920c8':
  vold: Enable the SO_PASSCRED socket option

Ensure that sender credentials are available when we
receive a netlink message.

Change-Id: I48411205a8fbc1ebd29834f64028662d80f15995

* commit '19df18af':
  add bounds checking for mPartMinors[]

* commit 'aecf0e2a':
  add bounds checking for mPartMinors[]

* commit 'f3d3ce5e':
  add bounds checking for mPartMinors[]

Change-Id: I6d5b26756c8434d6396f3535252608ce61eabfd8

Change-Id: I4069297a799260b8ecf355e91a1594b4f03126af
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I8bb658bb2ab66026f0a54f9c1f80fc5c6e8d918a
Signed-off-by: Mike Lockwood <lockwood@android.com>

Fix for bug 3415286.  Trigger an action in init.rc to load the persistent
properties after /data has been decrypted and mounted.

Change-Id: I5fe3b481bcc6963113e830728c204b22ffc3b722

The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems.  This fixes bug 3350709.

Change-Id: I4618bd5e8cccdce08494a7ca3f40ef72b2875e68