From a1766a1b2d2c2a826d6c204205233ba3ae30a54e Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Tue, 28 Aug 2018 18:11:26 +0100
Subject: [PATCH] Include NOTICE from /product and /product_services

Test: flashed on a device and checked Legal information webview
Bug: 111179267

Change-Id: I322ddc6903c80840b6f5db7fb9623bfd02b02b40
Merged-In: I5b88fd1c311011300e7db0f010a64150993ba52d
---
 .../com/android/settingslib/license/LicenseHtmlLoader.java    | 4 +++-
 1 file changed, 3 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 a9fb20ca9e170..4573ba2e9c877 100644
--- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
+++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
@@ -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;