Merge changes Iefd5b12b,I6907880a am: b888b08ffe

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

Change-Id: I850f44bba1efe2b2b0ed2a4eef2adeabf9b7223f
This commit is contained in:
Yifan Hong
2020-07-21 19:42:35 +00:00
committed by Automerger Merge Worker

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;