From b2e8c9a1485c77b4eaa0f8558ac1a9ea0fcdf8b3 Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Mon, 9 Jul 2018 18:45:30 +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: I5b88fd1c311011300e7db0f010a64150993ba52d
---
 .../src/com/android/settingslib/license/LicenseHtmlLoader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
index 92044c338ac0e..7ed357c42390e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
+++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
@@ -36,7 +36,8 @@ 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"};
     private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
 
     private Context mContext;