Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92fe9a1 authored by fionaxu's avatar fionaxu Committed by android-build-merger
Browse files

Backport changes to read sms app name safely am: 98f7080e am: f6a6d475 am: f61e7e7a 

am: 3549133e

Change-Id: I75785fb1449782bccce7127e77ef2db6c8e8417e
parents 79eecef6 3549133e

src/java/com/android/internal/telephony/SMSDispatcher.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1085,7 +1085,7 @@ public abstract class SMSDispatcher extends Handler { 
        PackageManager pm = mContext.getPackageManager();

        PackageManager pm = mContext.getPackageManager();

        try {

        try {

            ApplicationInfo appInfo = pm.getApplicationInfo(appPackage, 0);

            ApplicationInfo appInfo = pm.getApplicationInfo(appPackage, 0);

            return appInfo.loadLabel(pm);

            return appInfo.loadSafeLabel(pm);

        } catch (PackageManager.NameNotFoundException e) {

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "PackageManager Name Not Found for package " + appPackage);

            Rlog.e(TAG, "PackageManager Name Not Found for package " + appPackage);

            return appPackage;  // fall back to package name if we can't get app label

            return appPackage;  // fall back to package name if we can't get app label