| commit | 70e8833a2ef6c364b07b4b41abc3e8c94ddde920 | [log] [tgz] |
|---|---|---|
| author | Ramji Jiyani <ramjiyani@google.com> | Fri Oct 25 17:45:46 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Oct 25 17:45:46 2024 +0000 |
| tree | c3db1a9dd1f529048f37bf35de37d236aa4e7370 | |
| parent | 7872b0c0ca7b787f063925e79a047498f4dda7e4 [diff] | |
| parent | 24427d6a397aa74cd53c2c096c71bd6eeae9db01 [diff] |
Merge "Add system_dlkm notices in DEFAULT_LICENSE_XML_PATHS" into main
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index 121f549..3696000 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 @@ "/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";