Pavel Grafov
9890f89ca2
Don't look up parent user SID.
...
This is a revert of http://ag/741442
Every user now has their own SID, so there is no need to look up
profile parent anymore.
Bug: 38259874
Test: manual, using ConfirmCredential sample app in work profile.
Test: manual, making sure keys survive N->O-MR1 upgrade.
Change-Id: Ib2f52baeb7c5bfeec95431fccfd6ddd537019954
2017-06-28 20:38:33 +01:00
Elliott Hughes
667a2a4b82
Merge "Remove documentation for obsolete board configuration." am: 3f4cea940d am: a96d1aebdb am: 164f9c9e16
...
am: f067ab479f
2017-06-28 16:52:30 +00:00
Elliott Hughes
f067ab479f
Merge "Remove documentation for obsolete board configuration." am: 3f4cea940d am: a96d1aebdb
...
am: 164f9c9e16
2017-06-28 16:48:28 +00:00
Elliott Hughes
164f9c9e16
Merge "Remove documentation for obsolete board configuration." am: 3f4cea940d
...
am: a96d1aebdb
2017-06-28 16:44:57 +00:00
Elliott Hughes
a96d1aebdb
Merge "Remove documentation for obsolete board configuration."
...
am: 3f4cea940d
2017-06-28 16:40:41 +00:00
Treehugger Robot
3f4cea940d
Merge "Remove documentation for obsolete board configuration."
2017-06-28 16:36:52 +00:00
Elliott Hughes
76a934a459
Remove documentation for obsolete board configuration.
...
Bug: N/A
Test: builds
Change-Id: I5afbf2da35a7defb12b98bb5387ab7d3eee6f15a
2017-06-28 07:50:00 -07:00
Jiyong Park
43854aa6cb
resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp
...
am: 28bd98999b
2017-06-28 14:22:34 +00:00
Jiyong Park
28bd98999b
resolve merge conflicts of 645026c74 to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2
Change-Id: Iadfcd7e75044d62f2015dc62c69ee68869b40cd7
2017-06-28 22:52:25 +09:00
Jiyong Park
645026c742
resolve merge conflicts of 20d9cf2ee to stage-aosp-master
...
am: 22ca4f76c2
2017-06-28 13:30:01 +00:00
Hung-ying Tyan
53ea8efe0c
Merge "Load default prop from /system/etc/prop.default" into oc-dev-plus-aosp am: eb274d47e7 -s ours
...
am: cf5f11d769
2017-06-28 06:38:05 +00:00
Hung-ying Tyan
cf5f11d769
Merge "Load default prop from /system/etc/prop.default" into oc-dev-plus-aosp
...
am: eb274d47e7
2017-06-28 06:35:43 +00:00
Hung-ying Tyan
6f717a3d18
Load default prop from /system/etc/prop.default am: aef2b092f5 -s ours
...
am: dad7ec9517
2017-06-28 06:35:42 +00:00
Hung-ying Tyan
dad7ec9517
Load default prop from /system/etc/prop.default
...
am: aef2b092f5
2017-06-28 06:34:52 +00:00
Hung-ying Tyan
0c6a19657d
Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev am: d334d69b70
...
am: 42388236a4
2017-06-28 06:34:43 +00:00
Hung-ying Tyan
42388236a4
Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev
...
am: d334d69b70
2017-06-28 06:31:08 +00:00
TreeHugger Robot
eb274d47e7
Merge "Load default prop from /system/etc/prop.default" into oc-dev-plus-aosp
2017-06-28 06:29:32 +00:00
TreeHugger Robot
d334d69b70
Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev
2017-06-28 06:28:09 +00:00
Jiyong Park
22ca4f76c2
resolve merge conflicts of 20d9cf2ee to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2
Change-Id: Ie7feb839c9da2a11579ed850680c044c9fc3432a
2017-06-28 05:55:43 +00:00
Treehugger Robot
20d9cf2ee7
Merge "fs_mgr: add libfstab for vendor"
2017-06-28 04:57:48 +00:00
Bowgo Tsai
c8d4854bb7
Merge "AVB: allow no metadata in the generic system.img for project Treble" into oc-dr1-dev am: ad692c9b29 -s ours
...
am: b9b132c09a
2017-06-28 03:46:59 +00:00
Bowgo Tsai
1feb41ed73
AVB: allow no metadata in the generic system.img for project Treble am: 1773266f95 -s ours
...
am: 27a5371a8d
2017-06-28 03:46:09 +00:00
TreeHugger Robot
05f113c038
Merge "fs_mgr: add libfstab for vendor"
2017-06-28 03:45:36 +00:00
Bowgo Tsai
b9b132c09a
Merge "AVB: allow no metadata in the generic system.img for project Treble" into oc-dr1-dev
...
am: ad692c9b29
2017-06-28 03:42:42 +00:00
Bowgo Tsai
27a5371a8d
AVB: allow no metadata in the generic system.img for project Treble
...
am: 1773266f95
2017-06-28 03:42:06 +00:00
TreeHugger Robot
ad692c9b29
Merge "AVB: allow no metadata in the generic system.img for project Treble" into oc-dr1-dev
2017-06-28 03:37:04 +00:00
Guang Zhu
806f2ed9be
Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"" am: b5b4136ac4 am: aa447d7aa5 am: 3734cd3442
...
am: 387f28c18a
2017-06-28 02:33:21 +00:00
Guang Zhu
387f28c18a
Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"" am: b5b4136ac4 am: aa447d7aa5
...
am: 3734cd3442
2017-06-28 02:29:19 +00:00
Guang Zhu
3734cd3442
Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"" am: b5b4136ac4
...
am: aa447d7aa5
2017-06-28 02:25:49 +00:00
Jiyong Park
e7df1f7623
fs_mgr: add libfstab for vendor
...
libfstab is a subset of libfs_mgr, intended for vendors to use. It
exposes APIs for reading fstab. Note this 'visible to vendor' does not
mean that the API should be stable forever. The API can be changed in
later releases of Android, ,but the newer Android must not cause
run-time error when there is an older version of this static library
being used somewhere.
Bug: 62990533
Test: BOARD_VNDK_VERSION=current m -j libfstab.vendor
Change-Id: I371174fa1f6b4de6d6dd437b84ce4ed1e8740672
Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2
2017-06-28 11:24:25 +09:00
Guang Zhu
aa447d7aa5
Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent""
...
am: b5b4136ac4
2017-06-28 02:22:49 +00:00
Guang Zhu
b5b4136ac4
Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent""
2017-06-28 02:15:43 +00:00
Guang Zhu
c22f93856f
Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"
...
Bug: 63080844
This reverts commit 683ebc8059
2017-06-28 02:10:33 +00:00
Josh Gao
e7a56af0d2
Merge changes I5c6bf2a5,I20a337bb am: 7f81b2af61 am: 14e36421db am: 877708fcf1
...
am: 639dcaddeb
2017-06-28 00:09:27 +00:00
Josh Gao
639dcaddeb
Merge changes I5c6bf2a5,I20a337bb am: 7f81b2af61 am: 14e36421db
...
am: 877708fcf1
2017-06-28 00:06:23 +00:00
Josh Gao
877708fcf1
Merge changes I5c6bf2a5,I20a337bb am: 7f81b2af61
...
am: 14e36421db
2017-06-28 00:02:50 +00:00
Josh Gao
14e36421db
Merge changes I5c6bf2a5,I20a337bb
...
am: 7f81b2af61
2017-06-27 23:59:36 +00:00
Treehugger Robot
7f81b2af61
Merge changes I5c6bf2a5,I20a337bb
...
* changes:
debuggerd: diagnostics for dumps that are guaranteed to fail.
libprocinfo: add support for parsing process state.
2017-06-27 23:54:36 +00:00
Luis Hector Chavez
0333dedbc0
Merge "init: Terminate gracefully when CAP_SYS_BOOT is absent" am: fbb482f499 am: ec8a5f2aa6 am: 6d815a554d
...
am: e955adacb7
2017-06-27 23:12:40 +00:00
Dan Albert
f36350399b
Merge "Indicate that a packet was truncated." am: 046160959c am: e76c8020ba am: c83ec67ec3
...
am: 6c95c3edcd
2017-06-27 23:12:14 +00:00
Luis Hector Chavez
e955adacb7
Merge "init: Terminate gracefully when CAP_SYS_BOOT is absent" am: fbb482f499 am: ec8a5f2aa6
...
am: 6d815a554d
2017-06-27 23:07:18 +00:00
Dan Albert
6c95c3edcd
Merge "Indicate that a packet was truncated." am: 046160959c am: e76c8020ba
...
am: c83ec67ec3
2017-06-27 23:06:56 +00:00
Luis Hector Chavez
6d815a554d
Merge "init: Terminate gracefully when CAP_SYS_BOOT is absent" am: fbb482f499
...
am: ec8a5f2aa6
2017-06-27 23:04:13 +00:00
Dan Albert
c83ec67ec3
Merge "Indicate that a packet was truncated." am: 046160959c
...
am: e76c8020ba
2017-06-27 23:03:57 +00:00
Luis Hector Chavez
ec8a5f2aa6
Merge "init: Terminate gracefully when CAP_SYS_BOOT is absent"
...
am: fbb482f499
2017-06-27 23:01:19 +00:00
Dan Albert
e76c8020ba
Merge "Indicate that a packet was truncated."
...
am: 046160959c
2017-06-27 23:00:57 +00:00
Treehugger Robot
fbb482f499
Merge "init: Terminate gracefully when CAP_SYS_BOOT is absent"
2017-06-27 22:55:48 +00:00
Treehugger Robot
046160959c
Merge "Indicate that a packet was truncated."
2017-06-27 22:50:48 +00:00
Todd Poynor
f301aec0da
healthd: notify listeners using local copy of list, drop lock am: fd68370074 am: 4d88b49320
...
am: 84c07a584a
2017-06-27 22:14:48 +00:00
Mark Salyzyn
4a4259b51b
Merge changes Ibe1feb39,I05be83e4,If1422e4d am: a4f086ab20 am: 3a156e6c2b am: ca0c0bb96e
...
am: 872206fd80
2017-06-27 22:14:25 +00:00
