From de452e49af57c327b58a711fff7581103d28f147 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 21 Sep 2021 16:00:51 -0700 Subject: [PATCH] VintfObject.getHalNamesAndVersions report AIDL version number. Tests that rely on this API does not attempt to parse it, but rather treat this as an opaque string and upload them. Test: pass Bug: 200729012 Change-Id: I025e2602ab506ad009ce48d6329a230f12f1060c --- core/java/android/os/VintfObject.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/VintfObject.java b/core/java/android/os/VintfObject.java index bf0b655fe5749..1f11197afeee2 100644 --- a/core/java/android/os/VintfObject.java +++ b/core/java/android/os/VintfObject.java @@ -97,8 +97,11 @@ public class VintfObject { * ["android.hidl.manager@1.0", "android.hardware.camera.device@1.0", * "android.hardware.camera.device@3.2"]. There are no duplicates. * - * For AIDL HALs, the version is stripped away - * (e.g. "android.hardware.light"). + * For AIDL HALs, the version is a single number + * (e.g. "android.hardware.light@1"). Historically, this API strips the + * version number for AIDL HALs (e.g. "android.hardware.light"). Users + * of this API must be able to handle both for backwards compatibility. + * * @hide */ @TestApi