From e9d83796ac1b70d86f80ab3a67ca44d6e7a8f920 Mon Sep 17 00:00:00 2001 From: Dario Freni Date: Wed, 11 Jul 2018 10:52:53 +0100 Subject: [PATCH] Include NOTICE file in /product partition. Test: flashed on a device with /product partition and verified licences are correctly loaded Bug: 111179267 Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4 Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381 --- src/com/android/settings/LicenseHtmlLoader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/LicenseHtmlLoader.java b/src/com/android/settings/LicenseHtmlLoader.java index 97179269013..fa8f4c23edb 100644 --- a/src/com/android/settings/LicenseHtmlLoader.java +++ b/src/com/android/settings/LicenseHtmlLoader.java @@ -36,7 +36,8 @@ class LicenseHtmlLoader extends AsyncLoader { "/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"}; private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; private Context mContext;