aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Orr <brianorr@google.com>2018-10-18 10:42:59 -0700
committerdianlujitao <dianlujitao@lineageos.org>2019-10-17 19:53:17 +0800
commita9b0b0d1fdd316b595a22175d0dcd7342469ae2b (patch)
treebb4eaf42883685262e327e07928c26005adcf1be
parentee3581dd68eeaa672867c1d289a5ba37996f4bd2 (diff)
downloadandroid_frameworks_opt_telephony-a9b0b0d1fdd316b595a22175d0dcd7342469ae2b.tar.gz
android_frameworks_opt_telephony-a9b0b0d1fdd316b595a22175d0dcd7342469ae2b.tar.bz2
android_frameworks_opt_telephony-a9b0b0d1fdd316b595a22175d0dcd7342469ae2b.zip
Fix ClassLoader crash in com.android.phone
The custom PathClassLoader was not loading the .jar required for the V1.0 HIDL manager class. This change switches to the ClassLoader of the TelephonyComponentFactory (used by the com.android.phone app) which has access to all required libraries. Test: verified crash message no longer displays in the home screen and crash dump no longer appears in "adb logcat" Change-Id: Id7ae65eef294e4dc042a0f85807575c7e49b973e
-rw-r--r--src/java/com/android/internal/telephony/TelephonyComponentFactory.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/TelephonyComponentFactory.java b/src/java/com/android/internal/telephony/TelephonyComponentFactory.java
index 8700f082a..3fa631ea1 100644
--- a/src/java/com/android/internal/telephony/TelephonyComponentFactory.java
+++ b/src/java/com/android/internal/telephony/TelephonyComponentFactory.java
@@ -228,10 +228,8 @@ public class TelephonyComponentFactory {
public static TelephonyComponentFactory getInstance() {
if (sInstance == null) {
String fullClsName = "com.qualcomm.qti.internal.telephony.QtiTelephonyComponentFactory";
- String libPath = "/system/framework/qti-telephony-common.jar";
- PathClassLoader classLoader = new PathClassLoader(libPath,
- ClassLoader.getSystemClassLoader());
+ ClassLoader classLoader = TelephonyComponentFactory.class.getClassLoader();
Rlog.d(LOG_TAG, "classLoader = " + classLoader);
if (fullClsName == null || fullClsName.length() == 0) {