Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27560823 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes Iefd5b12b,I6907880a am: b888b08f 

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

Change-Id: I850f44bba1efe2b2b0ed2a4eef2adeabf9b7223f
parents e7e3572b b888b08f

packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java

+4 −1
Original line number Diff line number Diff line
@@ -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;