Merge "Added userLocales to InitialUserInfoResponse." into rvc-dev am: 38cbff9027 am: e1d802ae43 am: b6cd63f089

Change-Id: Iad5be59e424329845d7f76dbcf4bbd6603d94ba8
This commit is contained in:
TreeHugger Robot 2020-05-20 02:46:12 +00:00 committed by Automerger Merge Worker
commit e40eb84de1

View file

@ -2527,14 +2527,21 @@ enum VehicleProperty : int32_t {
* int32[5]: 0 // user #0 (usersInfo.existingUsers[0].userId) * int32[5]: 0 // user #0 (usersInfo.existingUsers[0].userId)
* int32[6]: 1 // flags of user #0 (usersInfo.existingUsers[0].flags) * int32[6]: 1 // flags of user #0 (usersInfo.existingUsers[0].flags)
* *
* And if the HAL want to respond with the creation of an admin user called "Admin", the * And if the HAL want to respond with the creation of an admin user called "Owner", the
* response would be: * response would be:
* *
* int32[0]: 42 // must match the request id from the request * int32[0]: 42 // must match the request id from the request
* int32[1]: 2 // action = InitialUserInfoResponseAction::CREATE * int32[1]: 2 // action = InitialUserInfoResponseAction::CREATE
* int32[2]: -1 // userToSwitchOrCreate.userId (not used as user will be created) * int32[2]: -1 // userToSwitchOrCreate.userId (not used as user will be created)
* int32[3]: 8 // userToSwitchOrCreate.flags = ADMIN * int32[3]: 8 // userToSwitchOrCreate.flags = ADMIN
* string: "Admin" // userNameToCreate * string: "||Owner" // userLocales + separator + userNameToCreate
*
* Notice the string value represents multiple values, separated by ||. The first value is the
* (optional) system locales for the user to be created (in this case, it's empty, meaning it
* will use Android's default value), while the second value is the (also optional) name of the
* to user to be created (when the type of response is InitialUserInfoResponseAction:CREATE).
* For example, to create the same "Owner" user with "en-US" and "pt-BR" locales, the string
* value of the response would be "en-US,pt-BR||Owner".
* *
* NOTE: if the HAL doesn't support user management, then it should not define this property, * NOTE: if the HAL doesn't support user management, then it should not define this property,
* which in turn would disable the other user-related properties (for example, the Android * which in turn would disable the other user-related properties (for example, the Android
@ -4367,6 +4374,12 @@ struct InitialUserInfoResponse {
* Name of the user that should be created. * Name of the user that should be created.
*/ */
string userNameToCreate; string userNameToCreate;
/**
* System locales of the initial user (value will be passed as-is to
* android.provider.Settings.System.SYSTEM_LOCALES)
*/
string userLocales;
}; };
/** /**