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"

Browse Source 
am: 17115bdb02

Change-Id: Iba47449f44e8ad4ef17f8b4c5bfb1b713e12a7da
This commit is contained in:
Dario Freni
2018-08-29 02:31:34 -07:00
committed by android-build-merger
parent ccf3aebc41 17115bdb02
commit ccbda28785
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", "/system/etc/NOTICE.xml.gz",
"/vendor/etc/NOTICE.xml.gz", "/vendor/etc/NOTICE.xml.gz",
"/odm/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 static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
private Context mContext; private Context mContext;