commit 39711064c0eec52599a759218fda1d528d83c09f
author Yifan Hong <elsk@google.com> Mon Jul 20 23:19:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 23:19:10 2020 +0000
tree 102210a0a8390281943e80d01466fa75a1432946
parent 7db029a109026385ff778936383fb813e97f51c7
parent 3d5536b0d8e6628e9eb40d6e71d8e72d234b91d4

Merge "Sync with platform NOTICE files paths"

src/com/android/car/settings/system/LicenseHtmlLoader.java

diff --git a/src/com/android/car/settings/system/LicenseHtmlLoader.java b/src/com/android/car/settings/system/LicenseHtmlLoader.java
index 8bdf9f7..e4d010e 100644
--- a/src/com/android/car/settings/system/LicenseHtmlLoader.java
+++ b/src/com/android/car/settings/system/LicenseHtmlLoader.java
@@ -35,7 +35,13 @@
             "/system/etc/NOTICE.xml.gz",
             "/vendor/etc/NOTICE.xml.gz",
             "/odm/etc/NOTICE.xml.gz",
-            "/oem/etc/NOTICE.xml.gz"};
+            "/oem/etc/NOTICE.xml.gz",
+            "/product/etc/NOTICE.xml.gz",
+            "/system_ext/etc/NOTICE.xml.gz",
+            "/vendor_dlkm/etc/NOTICE.xml.gz",
+            "/odm_dlkm/etc/NOTICE.xml.gz",
+    };
+
     private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
 
     private final Context mContext;