diff options
| author | 2024-10-25 18:35:52 +0000 | |
|---|---|---|
| committer | 2024-10-25 18:35:52 +0000 | |
| commit | a4223de1c3e70fab8314e7f50d25da1eef096982 (patch) | |
| tree | 396a0f9177d64b88ad1bfaec140a7aa9162fc4f1 | |
| parent | 58045730cc3a09711420659ebb063eb2cf556bf2 (diff) | |
| parent | e9077bf241a2f21c2f9e2d0bb3556ffaf8ccab53 (diff) | |
Merge "Add system_dlkm notices in DEFAULT_LICENSE_XML_PATHS" into main am: 70e8833a2e am: e9077bf241
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3315925
Change-Id: Icbbf27574cd85309af1ade559e0d82348e277ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index 121f5492a5ab..36960002e220 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java @@ -41,6 +41,7 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat<File> { "/system_ext/etc/NOTICE.xml.gz", "/vendor_dlkm/etc/NOTICE.xml.gz", "/odm_dlkm/etc/NOTICE.xml.gz", + "/system_dlkm/etc/NOTICE.xml.gz", }; static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; |