From 0fd963cad8e723ac9a6555a79f218214bf7deb76 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 22 Apr 2020 09:59:13 -0700 Subject: [PATCH] Minor corrections on USER_SWITCH documentation. Also removed the hash check on Vehicle HAL files, as they're still being worked on. Test: m Bug: 15249991 Change-Id: I214ebc9b5bbd71e5db1a1332296ceb4e426c50cf --- automotive/vehicle/2.0/types.hal | 20 ++++++++++++-------- current.txt | 3 --- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 23f91356b6..82f938c611 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -2646,9 +2646,9 @@ enum VehicleProperty : int32_t { * If the request succeeded and Android has 3 users (0, 10, 11), the response would be: * * int32[0]: -108 // request id - * int32[1]: 5 // messageType = SwitchUserMessageType::ANDROID_SWITCH + * int32[1]: 5 // messageType = SwitchUserMessageType::ANDROID_POST_SWITCH * int32[2]: 11 // target user id - * int32[3]: 11 // target user id flags (none) + * int32[3]: 0 // target user id flags (none) * int32[4]: 11 // current user * int32[5]: 0 // current user flags (none) * int32[6]: 3 // number of users @@ -2664,17 +2664,21 @@ enum VehicleProperty : int32_t { * * 5.ANDROID_POST_SWITCH * --------------------- - * Called by the Android System after a request to switch a user was made + * Called by the Android System after a request to switch a user was made. * * This property is called after switch requests of any type (i.e., LEGACY_ANDROID_SWITCH, * ANDROID_SWITCH, or VEHICLE_REQUEST) and can be used to determine if the request succeeded or * failed: * - * 1. When it succeeded, it's called when the Android user is in the boot locked state and the - * value of the current and target users ids in the response are different. This would be - * equivalent to receiving an Intent.ACTION_LOCKED_BOOT_COMPLETED in an Android app. + * 1. When it succeeded, it's called when the Android user is in the unlocked state and the + * value of the current and target users ids in the response are the same. This would be + * equivalent to receiving an Intent.ACTION_USER_UNLOCKED in an Android app. * 2. When it failed it's called right away and the value of the current and target users ids - * in the response are the same. + * 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 + * 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 + * 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 * reply back to the Android System. @@ -2824,7 +2828,7 @@ enum VehicleProperty : int32_t { * int32[0]: 0 (Android user flags) * int32[1]: 1 (number of associations being set) * int32[2]: 101 (1st type: UserIdentificationAssociationType::CUSTOM_1) - * int32[3]: 1 (1st value: UserIdentificationAssociationSETValue::ASSOCIATE_CURRENT_USER) + * int32[3]: 1 (1st value: UserIdentificationAssociationSetValue::ASSOCIATE_CURRENT_USER) * * If the request succeeded, the response would be simply: * diff --git a/current.txt b/current.txt index e553999c59..eb2273ee19 100644 --- a/current.txt +++ b/current.txt @@ -656,9 +656,6 @@ b7015428cd52ce8192d13bfcbf2c4455cda3727d57f2aac80d65a1747104f5ac android.hardwar 7d2e77ad86766bbc213fa7377eab739f44cc0866e567e6d33c0e27e7f99e27a8 android.hardware.automotive.sv@1.0::ISurroundViewSession d34769e55df919739bb46f25ae2e125e9c807733afa94daeca20feadd74de79c android.hardware.automotive.sv@1.0::ISurroundViewStream affd9c591f48a69773fcf43dc4a716d292cd4bc5ba2be8649276af0aedea435d android.hardware.automotive.sv@1.0::types -b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle -7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback -6b2564fce1d364baf9ba15a5cb00a8f08f86a5be5387c0ede795328ca536a2c7 android.hardware.automotive.vehicle@2.0::types 140f8f62100ccf9cd282ae3685a0f4ef0a9f971d77dfbc7350ccb4e04cf295ec android.hardware.biometrics.fingerprint@2.2::IBiometricsFingerprint 82cad99f5feb2ea9bcd4579055edf4af8feb9fc602a6e4827ddd727d254d4991 android.hardware.biometrics.fingerprint@2.2::IBiometricsFingerprintClientCallback ae6315fd42196478ac08441cb489d854118001bca5b9b9fd58af5110952be30e android.hardware.biometrics.fingerprint@2.2::types