OSDN Git Service

Include NOTICE file in /product partition.
authorDario Freni <dariofreni@google.com>
Wed, 11 Jul 2018 09:52:53 +0000 (10:52 +0100)
committerDario Freni <dariofreni@google.com>
Wed, 11 Jul 2018 09:52:53 +0000 (10:52 +0100)
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

index 9717926..fa8f4c2 100644 (file)
@@ -36,7 +36,8 @@ 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"};
     private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
 
     private Context mContext;