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

Commit ccbda287 authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

Merge "Include NOTICE from /product and /product_services" 

am: 17115bdb

Change-Id: Iba47449f44e8ad4ef17f8b4c5bfb1b713e12a7da
parents ccf3aebc 17115bdb

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

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ public class LicenseHtmlLoader extends AsyncLoader<File> { 
            "/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",

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

    private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";



    private Context mContext;