Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include NOTICE from /product and /product_services" am: 17115bdb02

Browse Source 
am: ccbda28785

Change-Id: I9a808e76f8d5432f98dc0b2ad34fc05367c0a936
This commit is contained in:
Dario Freni
2018-08-29 02:40:15 -07:00
committed by android-build-merger
parent d35c4ea5db ccbda28785
commit b613c39cbe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java
View File

@@ -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;