From 909db8a3090ac837ac81f8207cf677f7676dd481 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 27 Jan 2023 16:43:26 -0800 Subject: [PATCH] Deprecate Android P VINTF. Devices launching with P VINTF requirements (including HALs and kernels) will not be able to update to Android U. If a device wish to do so, it must update the vendor / odm partitions to match newer VINTF requirements. The list in fcm_execlude is generated with: system/libvintf/analyze_matrix/hals_for_release.py -d -j --package-only | python3 -m json.tool in the 3~4 section. Test: TH Bug: 205175891 Change-Id: I0f3584f461f9545ca9d3a508baa1e2fc562eabd3 --- compatibility_matrices/Android.bp | 11 - compatibility_matrices/Android.mk | 1 - .../compatibility_matrix.3.xml | 481 ------------------ .../exclude/fcm_exclude.cpp | 18 + 4 files changed, 18 insertions(+), 493 deletions(-) delete mode 100644 compatibility_matrices/compatibility_matrix.3.xml diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 7e2f7883e0..e1ad1f30ff 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp @@ -21,17 +21,6 @@ package { default_applicable_licenses: ["hardware_interfaces_license"], } -vintf_compatibility_matrix { - name: "framework_compatibility_matrix.3.xml", - stem: "compatibility_matrix.3.xml", - srcs: [ - "compatibility_matrix.3.xml", - ], - kernel_configs: [ - "kernel_config_p_4.14", - ], -} - vintf_compatibility_matrix { name: "framework_compatibility_matrix.4.xml", stem: "compatibility_matrix.4.xml", diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index a20f985eec..6e4c4193f7 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -98,7 +98,6 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) endif # DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE my_system_matrix_deps := \ - framework_compatibility_matrix.3.xml \ framework_compatibility_matrix.4.xml \ framework_compatibility_matrix.5.xml \ framework_compatibility_matrix.6.xml \ diff --git a/compatibility_matrices/compatibility_matrix.3.xml b/compatibility_matrices/compatibility_matrix.3.xml deleted file mode 100644 index 0964c9964c..0000000000 --- a/compatibility_matrices/compatibility_matrix.3.xml +++ /dev/null @@ -1,481 +0,0 @@ - - - android.hardware.audio - 4.0 - - IDevicesFactory - default - - - - android.hardware.audio.effect - 4.0 - - IEffectsFactory - default - - - - android.hardware.authsecret - 1.0 - - IAuthSecret - default - - - - android.hardware.automotive.audiocontrol - 1.0 - - IAudioControl - default - - - - android.hardware.automotive.evs - 1.0 - - IEvsEnumerator - default - - - - android.hardware.automotive.vehicle - 2.0 - - IVehicle - default - - - - android.hardware.biometrics.fingerprint - 2.1 - - IBiometricsFingerprint - default - - - - android.hardware.bluetooth - 1.0 - - IBluetoothHci - default - - - - android.hardware.bluetooth.a2dp - 1.0 - - IBluetoothAudioOffload - default - - - - android.hardware.boot - 1.0 - - IBootControl - default - - - - android.hardware.broadcastradio - 1.0-1 - - IBroadcastRadioFactory - default - - - - android.hardware.broadcastradio - 2.0 - - IBroadcastRadio - .* - - - - android.hardware.camera.provider - 2.4 - - ICameraProvider - [^/]+/[0-9]+ - - - - android.hardware.cas - 1.0 - - IMediaCasService - default - - - - android.hardware.configstore - 1.0-1 - - ISurfaceFlingerConfigs - default - - - - android.hardware.confirmationui - 1.0 - - IConfirmationUI - default - - - - android.hardware.contexthub - 1.0 - - IContexthub - default - - - - android.hardware.drm - 1.0 - - ICryptoFactory - .* - - - IDrmFactory - .* - - - - android.hardware.drm - 1.1 - - ICryptoFactory - .* - - - IDrmFactory - .* - - - - android.hardware.dumpstate - 1.0 - - IDumpstateDevice - default - - - - android.hardware.gatekeeper - 1.0 - - IGatekeeper - default - - - - android.hardware.gnss - 1.0-1 - - IGnss - default - - - - - android.hardware.graphics.allocator - 2.0 - - IAllocator - default - - - - android.hardware.graphics.composer - 2.1-2 - - IComposer - default - - - - android.hardware.graphics.mapper - 2.0-1 - - IMapper - default - - - - - android.hardware.health - 2.0 - - IHealth - default - - - - android.hardware.ir - 1.0 - - IConsumerIr - default - - - - android.hardware.keymaster - 3.0 - 4.0 - - IKeymasterDevice - default - - - - android.hardware.keymaster - 4.0 - - IKeymasterDevice - strongbox - - - - android.hardware.light - 2.0 - - ILight - default - - - - android.hardware.media.omx - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.memtrack - 1.0 - - IMemtrack - default - - - - android.hardware.neuralnetworks - 1.0-1 - - IDevice - .* - - - - android.hardware.nfc - 1.1 - - INfc - default - - - - android.hardware.oemlock - 1.0 - - IOemLock - default - - - - android.hardware.power - 1.0-3 - - IPower - default - - - - android.hardware.radio - - 1.0-3 - - IRadio - slot1 - slot2 - slot3 - - - - android.hardware.radio - 1.0-2 - - ISap - slot1 - - - - android.hardware.radio.config - 1.0 - - IRadioConfig - default - - - - android.hardware.renderscript - 1.0 - - IDevice - default - - - - android.hardware.secure_element - 1.0 - - ISecureElement - eSE[1-9][0-9]* - SIM[1-9][0-9]* - - - - android.hardware.sensors - 1.0 - - ISensors - default - - - - android.hardware.soundtrigger - 2.0-1 - - ISoundTriggerHw - default - - - - android.hardware.tetheroffload.config - 1.0 - - IOffloadConfig - default - - - - android.hardware.tetheroffload.control - 1.0 - - IOffloadControl - default - - - - android.hardware.thermal - 1.0-1 - - IThermal - default - - - - android.hardware.tv.cec - 1.0 - - IHdmiCec - default - - - - android.hardware.tv.input - 1.0 - - ITvInput - default - - - - android.hardware.usb - 1.0-1 - - IUsb - default - - - - android.hardware.usb.gadget - 1.0 - - IUsbGadget - default - - - - android.hardware.vibrator - 1.0-2 - - IVibrator - default - - - - android.hardware.vr - 1.0 - - IVr - default - - - - android.hardware.weaver - 1.0 - - IWeaver - default - - - - android.hardware.wifi - 1.0-2 - - IWifi - default - - - - android.hardware.wifi.hostapd - 1.0 - - IHostapd - default - - - - android.hardware.wifi.offload - 1.0 - - IOffload - default - - - - android.hardware.wifi.supplicant - 1.0-1 - - ISupplicant - default - - - diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp index 3c0c5f1d68..b17c0e22c6 100644 --- a/compatibility_matrices/exclude/fcm_exclude.cpp +++ b/compatibility_matrices/exclude/fcm_exclude.cpp @@ -84,6 +84,24 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) { "android.hardware.nfc@1.0", // TODO(b/171260715) Remove when HAL definition is removed "android.hardware.radio.deprecated@1.0", + + // TODO(b/205175891): File individual bugs for these HALs deprecated in P + "android.hardware.audio.effect@4.0", + "android.hardware.audio@4.0", + "android.hardware.bluetooth.a2dp@1.0", + "android.hardware.cas@1.0", + "android.hardware.configstore@1.0", + "android.hardware.gnss@1.0", + "android.hardware.gnss@1.1", + "android.hardware.graphics.mapper@2.0", + "android.hardware.nfc@1.1", + "android.hardware.radio.config@1.0", + "android.hardware.radio@1.0", + "android.hardware.radio@1.1", + "android.hardware.radio@1.3", + "android.hardware.thermal@1.0", + "android.hardware.thermal@1.1", + "android.hardware.wifi.offload@1.0", }; auto package_has_prefix = [&](const std::string& prefix) {