Elliott Hughes
9d748c8bf4
am a6241a02
: Merge "Replace HAVE_WIN32_IPC with _WIN32."
...
* commit 'a6241a0298de5e773ef113626ca4686f9c038868':
Replace HAVE_WIN32_IPC with _WIN32.
2015-07-09 17:29:46 +00:00
Elliott Hughes
a6241a0298
Merge "Replace HAVE_WIN32_IPC with _WIN32."
2015-07-09 17:16:13 +00:00
Elliott Hughes
095307ec49
Replace HAVE_WIN32_IPC with _WIN32.
...
Change-Id: Ie9dc064fb23a4e4bd4856c9668784dec0be9d2d6
2015-07-09 10:03:18 -07:00
Christopher Ferris
a8effd7463
am 60937547
: am 0473a1ea
: am b6deb331
: Merge "New property that determines when to wait for gdb."
...
* commit '6093754759075d2bde1516c75b032b8b183bc60d':
New property that determines when to wait for gdb.
2015-07-08 23:45:27 +00:00
Christopher Ferris
6093754759
am 0473a1ea
: am b6deb331
: Merge "New property that determines when to wait for gdb."
...
* commit '0473a1ea51ff42695a678e90f27b564d4aaf7f57':
New property that determines when to wait for gdb.
2015-07-08 23:31:03 +00:00
Christopher Ferris
0473a1ea51
am b6deb331
: Merge "New property that determines when to wait for gdb."
...
* commit 'b6deb33120a2b84b64fbf63bf2ec17bc8d13d2e3':
New property that determines when to wait for gdb.
2015-07-08 23:17:10 +00:00
Christopher Ferris
b6deb33120
Merge "New property that determines when to wait for gdb."
2015-07-08 23:07:21 +00:00
Christopher Ferris
d79f2bebcc
New property that determines when to wait for gdb.
...
Use debug.debuggerd.wait_for_gdb being set to non-zero to
determine if debuggerd should stop and wait for someone to
attach gdb to the crashing process.
Bug: 22233908
Change-Id: Id55a1572b479a70d395b7270392ce6fb70dbfdca
2015-07-08 16:01:49 -07:00
Daniel Rosenberg
3e04930427
am 801ee194
: am 32933ff5
: am dc4fa7f6
: Merge "Fix "adb remount" for when the root directory is in system.img"
...
* commit '801ee194d69378f21717e13d8f7e4d111a5ede73':
Fix "adb remount" for when the root directory is in system.img
2015-07-08 20:56:35 +00:00
Daniel Rosenberg
801ee194d6
am 32933ff5
: am dc4fa7f6
: Merge "Fix "adb remount" for when the root directory is in system.img"
...
* commit '32933ff511a4b63f60543c97e2fc3b47ea465d1a':
Fix "adb remount" for when the root directory is in system.img
2015-07-08 20:42:20 +00:00
Andres Morales
fef908e5a5
[gatekeeperd] fix use of uninitialized memory
...
Bug: 22319772
Change-Id: I3cb83389f11e54867aca132de48a3f6407b7eaf3
2015-07-08 20:33:36 +00:00
Daniel Rosenberg
32933ff511
am dc4fa7f6
: Merge "Fix "adb remount" for when the root directory is in system.img"
...
* commit 'dc4fa7f68a5cf2a2d94b9e2c401d7af0bcf2f5ca':
Fix "adb remount" for when the root directory is in system.img
2015-07-08 20:27:31 +00:00
Daniel Rosenberg
dc4fa7f68a
Merge "Fix "adb remount" for when the root directory is in system.img"
2015-07-08 20:15:15 +00:00
Christopher Ferris
0800883c30
am 78ec30d9
: am 708e5438
: am 41a0654e
: Merge "Replace all _LOG error calls with ALOGE."
...
* commit '78ec30d9525a20094292ee74e8c8b94088b9dbe5':
Replace all _LOG error calls with ALOGE.
2015-07-08 19:54:23 +00:00
Christopher Ferris
78ec30d952
am 708e5438
: am 41a0654e
: Merge "Replace all _LOG error calls with ALOGE."
...
* commit '708e543827464c615866615ab911bf8d1128dc4b':
Replace all _LOG error calls with ALOGE.
2015-07-08 19:44:55 +00:00
Daniel Rosenberg
d6eba89f83
Fix "adb remount" for when the root directory is in system.img
...
When the root directory has been built into system.img, it is
mounted at /.
Change-Id: If01d12efeaa53b4ae59e801a6e9b802a9ae5882d
2015-07-08 19:36:19 +00:00
Christopher Ferris
708e543827
am 41a0654e
: Merge "Replace all _LOG error calls with ALOGE."
...
* commit '41a0654e2a76a8c639b2265513345cc4c268560d':
Replace all _LOG error calls with ALOGE.
2015-07-08 19:27:12 +00:00
Christopher Ferris
41a0654e2a
Merge "Replace all _LOG error calls with ALOGE."
2015-07-08 19:16:03 +00:00
Sami Tolvanen
915b10cabf
am 7a6e04fe
: am eb528dd5
: Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev
...
* commit '7a6e04fe514f6a51985c8481817403a7ef404b5a':
fs_mgr: Use ro.boot.veritymode
2015-07-08 16:19:50 +00:00
Sami Tolvanen
7a6e04fe51
am eb528dd5
: Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev
...
* commit 'eb528dd5a152d66216b9a2793a3619a65411950c':
fs_mgr: Use ro.boot.veritymode
2015-07-08 16:07:01 +00:00
Sami Tolvanen
eb528dd5a1
Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev
2015-07-08 15:26:17 +00:00
Sami Tolvanen
3fd58ae7e5
fs_mgr: Use ro.boot.veritymode
...
If verity state is managed by bootloader, it will pass the verity
mode to the kernel in the androidboot.veritymode command line
parameter. Init copies the value to the ro.boot.veritymode property.
Check for ro.boot.veritymode in fs_mgr and use the value to set
dm-verity mode. If this property is not set, store verity state in
metadata as before, if a storage location is specified in fstab.
Bug: 21605676
Change-Id: Ife3c978c133248432c302583d3b70e179605fe42
(cherry picked from commit ac5c1224cf
)
2015-07-08 07:54:24 +00:00
Elliott Hughes
426c8cac72
am d8af16bf
: am dba00aab
: am c9aeae27
: Merge "Fix debuggerd\'s gdbclient instructions."
...
* commit 'd8af16bf45bf9af62fabd676a2c085ef241935be':
Fix debuggerd's gdbclient instructions.
2015-07-07 22:37:02 +00:00
Elliott Hughes
d8af16bf45
am dba00aab
: am c9aeae27
: Merge "Fix debuggerd\'s gdbclient instructions."
...
* commit 'dba00aab9299971babe101a03af265fbf7257f49':
Fix debuggerd's gdbclient instructions.
2015-07-07 22:18:27 +00:00
Elliott Hughes
dba00aab92
am c9aeae27
: Merge "Fix debuggerd\'s gdbclient instructions."
...
* commit 'c9aeae27403db86e1ec30c953f1d0fd6ae63b184':
Fix debuggerd's gdbclient instructions.
2015-07-07 22:02:11 +00:00
Elliott Hughes
c9aeae2740
Merge "Fix debuggerd's gdbclient instructions."
2015-07-07 21:42:24 +00:00
Elliott Hughes
39a28c2526
Fix debuggerd's gdbclient instructions.
...
We improved gdbclient to make the process simpler, but didn't update
debuggerd to match.
Bug: http://b/22233857
Change-Id: If4137943f567a9e566a3ac7f485c9b1eab2c68e9
2015-07-07 14:34:39 -07:00
Paul Lawrence
2ed2e30120
am e8308f85
: am 81046166
: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
...
* commit 'e8308f852c867bc676e71875ea57de022464ea09':
Revert "Change init sequence to support file level encryption"
2015-07-07 20:36:19 +00:00
Paul Lawrence
948410a493
Change init sequence to support file level encryption
...
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.
Split property loaded into system and data, and load in right order.
Bug: 22233063
2015-07-07 13:23:19 -07:00
Paul Lawrence
e8308f852c
am 81046166
: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
...
* commit '8104616696ac5e806b16a393ea02c4f5d8efc328':
Revert "Change init sequence to support file level encryption"
2015-07-07 18:20:27 +00:00
Paul Lawrence
8104616696
Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
2015-07-07 17:29:00 +00:00
Paul Lawrence
437bc5dcec
Revert "Change init sequence to support file level encryption"
...
This reverts commit d815178b75
.
Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c
2015-07-07 17:05:58 +00:00
Andres Morales
d80e243411
am 722d4a54
: am 833f142d
: Merge "[init] start gatekeeperd after device decryption" into mnc-dev
...
* commit '722d4a54d9fa49581931e7c88fee5aa0c1f3c5f8':
[init] start gatekeeperd after device decryption
2015-07-07 01:09:04 +00:00
Mark Salyzyn
ca0b823338
am 609c7acd
: am 6b6c1bd9
: Gracefully handle ENODEV in sdcard daemon (part deux)
...
* commit '609c7acd085531cef1d176162b0476e5013c0769':
Gracefully handle ENODEV in sdcard daemon (part deux)
2015-07-07 00:33:05 +00:00
Paul Lawrence
1c875cc40f
am 22d0ee6a
: am a65e402b
: Merge "Change init sequence to support file level encryption" into mnc-dev
...
* commit '22d0ee6a25b3bedd6c3cd52473df1404fce8615f':
Change init sequence to support file level encryption
2015-07-07 00:32:17 +00:00
Jeff Sharkey
7c195a2760
am 341b607c
: am 25aabb9e
: Permission to view shared storage for all users.
...
* commit '341b607c89649e901bd4b18c201693ce9b7c00a3':
Permission to view shared storage for all users.
2015-07-07 00:31:18 +00:00
Andres Morales
722d4a54d9
am 833f142d
: Merge "[init] start gatekeeperd after device decryption" into mnc-dev
...
* commit '833f142d201a4b682885ff9d95c6b3ab32fd0618':
[init] start gatekeeperd after device decryption
2015-07-06 23:57:49 +00:00
Andres Morales
833f142d20
Merge "[init] start gatekeeperd after device decryption" into mnc-dev
2015-07-06 23:00:09 +00:00
Mark Salyzyn
609c7acd08
am 6b6c1bd9
: Gracefully handle ENODEV in sdcard daemon (part deux)
...
* commit '6b6c1bd996be7b7b640ef9b074435620f73eecac':
Gracefully handle ENODEV in sdcard daemon (part deux)
2015-07-06 22:57:00 +00:00
Mark Salyzyn
6b6c1bd996
Gracefully handle ENODEV in sdcard daemon (part deux)
...
reorder to handle errno correctly and remove log stutter
Bug: 22197797
Bug: 22241640
Change-Id: I81e6b2ff15b6ea6e5e780bd3599bf1019ff36f26
2015-07-06 13:46:49 -07:00
Paul Lawrence
22d0ee6a25
am a65e402b
: Merge "Change init sequence to support file level encryption" into mnc-dev
...
* commit 'a65e402b613e927697d35e7936c6d80908d77e88':
Change init sequence to support file level encryption
2015-07-06 20:34:05 +00:00
Paul Lawrence
a65e402b61
Merge "Change init sequence to support file level encryption" into mnc-dev
2015-07-06 19:33:30 +00:00
Jeff Sharkey
341b607c89
am 25aabb9e
: Permission to view shared storage for all users.
...
* commit '25aabb9edeb9203e52758d307b8a94ec8c64d338':
Permission to view shared storage for all users.
2015-07-06 19:18:20 +00:00
Andres Morales
4dd2982dd3
[init] start gatekeeperd after device decryption
...
gatekeeperd depends on having /data to determine whether
to call setup routines for qcom HALs.
Bug: 22298552
Change-Id: I6c552016dc863bbb04bd5a949a2317a720c8263f
2015-07-06 12:00:22 -07:00
Elliott Hughes
a2b0ff4999
am 17cf7498
: am f4bb11d2
: am 913ef1ca
: Merge "Fixed a documentation error in protocol.txt"
...
* commit '17cf7498a96402449f4b1a2293031d1dc514be47':
Fixed a documentation error in protocol.txt
2015-07-06 18:58:55 +00:00
Elliott Hughes
17cf7498a9
am f4bb11d2
: am 913ef1ca
: Merge "Fixed a documentation error in protocol.txt"
...
* commit 'f4bb11d29888bae67d09a8004c3925f7dea9b1fc':
Fixed a documentation error in protocol.txt
2015-07-06 18:46:20 +00:00
Elliott Hughes
f4bb11d298
am 913ef1ca
: Merge "Fixed a documentation error in protocol.txt"
...
* commit '913ef1ca5adb7f04b8e7282565ae98c656ebf90b':
Fixed a documentation error in protocol.txt
2015-07-06 18:00:42 +00:00
Jeff Sharkey
25aabb9ede
Permission to view shared storage for all users.
...
Typical apps are restricted so they can only view shared storage
belonging to the user they're running as. However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.
Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps. Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.
Bug: 19995822
Change-Id: Id2fe846aefbf13fc050e9b00ddef120021e817f4
2015-07-06 10:54:53 -07:00
Elliott Hughes
913ef1ca5a
Merge "Fixed a documentation error in protocol.txt"
2015-07-06 17:51:12 +00:00
Derrick Bonafilia
36da715f2f
Fixed a documentation error in protocol.txt
...
Prior to the documentation told users to pass 0 in as
the first argument to write messages, when they should
be outting in their local-id. It is now corrected.
Change-Id: Ia2c6c84f95383baa5ca471493a29a39e5173b604
Signed-off-by: Derrick Bonafilia <dbonafilia@google.com>
2015-07-06 10:19:28 -07:00