From a12966975ca06c89a7eaf4545d8d4dec157d90c6 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Thu, 4 Jul 2019 21:23:34 +0900 Subject: Change LicenseHtml search path from product_services -> system_ext product_services partition is not used anymore, its name is changed to system_ext, so following this, change path in LicenseHtml Test: m Bug: 134359158 Change-Id: I6907880ab8af456358fb3420b74dcd3e409b41f3 (cherry picked from commit 2f2fe4f72af4e3d39d38a1ad09b3cd02ded9d355) Merged-In: I6907880ab8af456358fb3420b74dcd3e409b41f3 --- .../src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java index 0b6996365372..ac7a12187fd6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoaderCompat.java @@ -38,7 +38,7 @@ public class LicenseHtmlLoaderCompat extends AsyncLoaderCompat { "/odm/etc/NOTICE.xml.gz", "/oem/etc/NOTICE.xml.gz", "/product/etc/NOTICE.xml.gz", - "/product_services/etc/NOTICE.xml.gz"}; + "/system_ext/etc/NOTICE.xml.gz"}; static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; private final Context mContext; -- cgit v1.2.3-59-g8ed1b