Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9573c1c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12000988

Change-Id: I355fc9b819ee0b596e00e60f55e24f0f22d0d883
parents 5f8fa814 f04be179

automotive/vehicle/2.0/types.hal

+12 −11
Original line number Original line Diff line number Diff line
@@ -2532,7 +2532,7 @@ enum VehicleProperty : int32_t { 
     *

     *

     * 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]: -10000  // userToSwitchOrCreate.userId (not used as user will be created)

     * int32[3]:  8      // userToSwitchOrCreate.flags = ADMIN

     * int32[3]:  8      // userToSwitchOrCreate.flags = ADMIN

     * string: "||Owner" // userLocales + separator + userNameToCreate

     * string: "||Owner" // userLocales + separator + userNameToCreate

     *

     *
@@ -2541,7 +2541,8 @@ enum VehicleProperty : int32_t { 
     * will use Android's default value), while the second value is the (also optional) name of the

     * 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).

     * 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

     * 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".

     * value of the response would be "en-US,pt-BR||Owner". As such, neither the locale nor the

     * name can have || on it, although a single | is fine.

     *

     *

     * 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
@@ -2626,7 +2627,7 @@ enum VehicleProperty : int32_t { 
     * int32[5]:  0   // current user flags (none)

     * int32[5]:  0   // current user flags (none)

     * int32[6]:  3   // number of users

     * int32[6]:  3   // number of users

     * int32[7]:  0   // 1st user (user 0)

     * int32[7]:  0   // 1st user (user 0)

     * int32[8]:  0   // 1st user flags (none)

     * int32[8]:  1   // 1st user flags (SYSTEM)

     * int32[9]:  10  // 2nd user (user 10)

     * int32[9]:  10  // 2nd user (user 10)

     * int32[10]: 0   // 2nd user flags (none)

     * int32[10]: 0   // 2nd user flags (none)

     * int32[11]: 11  // 3rd user (user 11)

     * int32[11]: 11  // 3rd user (user 11)
@@ -2660,7 +2661,7 @@ enum VehicleProperty : int32_t { 
     * identified the user as A.

     * identified the user as A.

     *

     *

     * The HAL makes this request by a property change event (passing a negative request id), and

     * The HAL makes this request by a property change event (passing a negative request id), and

     * the Android system will response by issuye an ANDROID_POST_SWITCH call which the same

     * the Android system will response by issue an ANDROID_POST_SWITCH call which the same

     * request id.

     * request id.

     *

     *

     * For example, if the current foreground Android user is 10 and the HAL asked it to switch to

     * For example, if the current foreground Android user is 10 and the HAL asked it to switch to
@@ -2704,7 +2705,7 @@ enum VehicleProperty : int32_t { 
     *    in the response are different (as the current user didn't change to the target).

     *    in the response are different (as the current user didn't change to the target).

     * 3. If a new switch request is made before the HAL responded to the previous one or before

     * 3. If a new switch request is made before the HAL responded to the previous one or before

     *    the user was unlocked, then the ANDROID_POST_SWITCH request is not made. For example,

     *    the user was unlocked, then the ANDROID_POST_SWITCH request is not made. For example,

     *    the driver could accidentally switch to the wrong user which has lock crentials, then

     *    the driver could accidentally switch to the wrong user which has lock credentials, then

     *    switch to the right one before entering the credentials.

     *    switch to the right one before entering the credentials.

     *

     *

     * The HAL can update its internal state once it receives this request, but it doesn't need to

     * The HAL can update its internal state once it receives this request, but it doesn't need to
@@ -4389,16 +4390,16 @@ struct InitialUserInfoResponse { 
     */

     */

    UserInfo userToSwitchOrCreate;

    UserInfo userToSwitchOrCreate;





    /**

     * Name of the user that should be created.

     */

    string userNameToCreate;



    /**

    /**

     * System locales of the initial user (value will be passed as-is to

     * System locales of the initial user (value will be passed as-is to

     * android.provider.Settings.System.SYSTEM_LOCALES)

     * android.provider.Settings.System.SYSTEM_LOCALES)

     */

     */

    string userLocales;

    string userLocales;



    /**

     * Name of the user that should be created.

     */

    string userNameToCreate;

};

};





/**

/**