diff options
| author | 2020-07-21 19:59:27 +0000 | |
|---|---|---|
| committer | 2020-07-21 19:59:27 +0000 | |
| commit | 0822a0161b01f6baa04febd4c1b3f17e3526b82a (patch) | |
| tree | e17c6aaf76fecbe00b4fc36affdaa1c63e62fb50 | |
| parent | 8b60e59cf2215ab5f98f4ea3f775521aa9537bf5 (diff) | |
| parent | 27560823fc5b44e7b10b22045124ddbcf4882f7d (diff) | |
Merge changes Iefd5b12b,I6907880a am: b888b08ffe am: 27560823fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365959
Change-Id: Ie4d2cfb7c516ba2df8a06f3fcbf8f887325e04e3
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index ac7a12187fd6..121f5492a5ab 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<File> { "/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; |