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

Commit a4223de1 authored by Ramji Jiyani's avatar Ramji Jiyani Committed by Automerger Merge Worker
Browse files

Merge "Add system_dlkm notices in DEFAULT_LICENSE_XML_PATHS" into main am:... 

Merge "Add system_dlkm notices in DEFAULT_LICENSE_XML_PATHS" into main am: 70e8833a am: e9077bf2

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



Change-Id: Icbbf27574cd85309af1ade559e0d82348e277ed6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58045730 e9077bf2

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat<File> { 
            "/system_ext/etc/NOTICE.xml.gz",

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

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

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

    };

    static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";