| commit | b888b08ffeadfc6879caf8f052efee9162eb4449 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Tue Jul 21 19:26:43 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 21 19:26:43 2020 +0000 |
| tree | 027c87e3f6f8a19a253c1bce500508c247726d33 | |
| parent | 01e469da99ba99b43eeaa52792cb87d6dba364ad [diff] | |
| parent | 6c0406f7a05f55567972d7585cf006c3fb8b4d18 [diff] |
Merge changes Iefd5b12b,I6907880a * changes: Add *_dlkm notice files. Change LicenseHtml search path from product_services -> system_ext
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index 0b69963..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", - "/product_services/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;