From 6c0406f7a05f55567972d7585cf006c3fb8b4d18 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 17 Jul 2020 15:39:10 -0700 Subject: [PATCH] Add *_dlkm notice files. Two new partitions are created in Android. New notice files are placed in these new partitions. Test: none Bug: 156020364 Change-Id: Iefd5b12b3bbb449b189ade313157e80f36d99c88 --- .../android/settingslib/license/LicenseHtmlLoaderCompat.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index ac7a12187fd6a..121f5492a5aba 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java @@ -38,7 +38,10 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat { "/odm/etc/NOTICE.xml.gz", "/oem/etc/NOTICE.xml.gz", "/product/etc/NOTICE.xml.gz", - "/system_ext/etc/NOTICE.xml.gz"}; + "/system_ext/etc/NOTICE.xml.gz", + "/vendor_dlkm/etc/NOTICE.xml.gz", + "/odm_dlkm/etc/NOTICE.xml.gz", + }; static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; private final Context mContext;