| commit | 27560823fc5b44e7b10b22045124ddbcf4882f7d | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Tue Jul 21 19:42:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 21 19:42:35 2020 +0000 |
| tree | 027c87e3f6f8a19a253c1bce500508c247726d33 | |
| parent | e7e3572bd604f1f97f2bcb0894db1e8b4cf2c7eb [diff] | |
| parent | b888b08ffeadfc6879caf8f052efee9162eb4449 [diff] |
Merge changes Iefd5b12b,I6907880a am: b888b08ffe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365959 Change-Id: I850f44bba1efe2b2b0ed2a4eef2adeabf9b7223f
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index ac7a121..121f549 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 @@ "/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;