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

Commit 5c9b74f5 authored by Dario Freni's avatar Dario Freni Committed by Android (Google) Code Review
Browse files

Merge "Include NOTICE file from /product_services."

parents 1201c5b2 8440d2a2

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,8 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat<File> { 
            "/vendor/etc/NOTICE.xml.gz",

            "/vendor/etc/NOTICE.xml.gz",

            "/odm/etc/NOTICE.xml.gz",

            "/odm/etc/NOTICE.xml.gz",

            "/oem/etc/NOTICE.xml.gz",

            "/oem/etc/NOTICE.xml.gz",

            "/product/etc/NOTICE.xml.gz"};

            "/product/etc/NOTICE.xml.gz",

            "/product_services/etc/NOTICE.xml.gz"};

    static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";

    static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";





    private final Context mContext;

    private final Context mContext;