release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-4185249 snap-temp-L63000000082739046
Change-Id: I0fb49957b040358562ff039fef020f42c74d7c40
diff --git a/dbus/cryptohome/rpc.proto b/dbus/cryptohome/rpc.proto
index bd5e6a2..1d81a2d 100644
--- a/dbus/cryptohome/rpc.proto
+++ b/dbus/cryptohome/rpc.proto
@@ -98,6 +98,9 @@
// Performs a public mount, which is used for a Kiosk session. Credentials are
// not needed in the request; they are synthesized by cryptohomed from id.
optional bool public_mount = 5;
+ // If set to true, mounts the vault to a temporary location. The mount is not
+ // exposed to the usual locations (/home/user, /home/root).
+ optional bool hidden_mount = 6;
}
// A BaseReply type is used for all cryptohomed responses. A shared base class
diff --git a/dbus/login_manager/arc.proto b/dbus/login_manager/arc.proto
index 7f8cddf..116984a 100644
--- a/dbus/login_manager/arc.proto
+++ b/dbus/login_manager/arc.proto
@@ -28,5 +28,9 @@
// and |scan_vendor_priv_app| are ignored when |for_login_screen| is true.
optional bool for_login_screen = 4;
- // Next ID to use: 5
+ // Option to create a server socket in session_manager.
+ // TODO(yusukes): Make this always enabled and then remove the field.
+ optional bool create_server_socket = 5;
+
+ // Next ID to use: 6
}
diff --git a/dbus/login_manager/dbus-constants.h b/dbus/login_manager/dbus-constants.h
index 2ad22fe..aa5aa4f 100644
--- a/dbus/login_manager/dbus-constants.h
+++ b/dbus/login_manager/dbus-constants.h
@@ -21,6 +21,8 @@
const char kSessionManagerStoreUnsignedPolicyForUser[] =
"StoreUnsignedPolicyForUser";
const char kSessionManagerRetrievePolicyForUser[] = "RetrievePolicyForUser";
+const char kSessionManagerRetrievePolicyForUserWithoutSession[] =
+ "RetrievePolicyForUserWithoutSession";
const char kSessionManagerStoreDeviceLocalAccountPolicy[] =
"StoreDeviceLocalAccountPolicy";
const char kSessionManagerRetrieveDeviceLocalAccountPolicy[] =