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

Merge changes Iefd5b12b,I6907880a am: b888b08ffe am: 27560823fc am: 0822a0161b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365959

Change-Id: I75ee81be981ab5a3f251cf7c202c124606c56c12
This commit is contained in:
Yifan Hong
2020-07-21 20:20:39 +00:00
committed by Automerger Merge Worker
parent cfb1ef5385 0822a0161b
commit 1cae21fa93
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",
"/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;