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

Commit b888b08f authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes Iefd5b12b,I6907880a 

* changes:
  Add *_dlkm notice files.
  Change LicenseHtml search path from product_services -> system_ext
parents 01e469da 6c0406f7

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",

            "/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";



    private final Context mContext;