Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Iefd5b12b,I6907880a

Browse Source 
* changes:
  Add *_dlkm notice files.
  Change LicenseHtml search path from product_services -> system_ext
This commit is contained in:
Yifan Hong
2020-07-21 19:26:43 +00:00
committed by Gerrit Code Review
parent 01e469da99 6c0406f7a0
commit b888b08ffe
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java
View File

@@ -38,7 +38,10 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat<File> {
"/odm/etc/NOTICE.xml.gz", "/odm/etc/NOTICE.xml.gz",
"/oem/etc/NOTICE.xml.gz", "/oem/etc/NOTICE.xml.gz",
"/product/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"; static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
private final Context mContext; private final Context mContext;