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

Commit eb3dab4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix confusion of userId vs. uid"

parents e6090d66 b086727b

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

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

        try {

            ApplicationInfo appInfo = pm.getApplicationInfoAsUser(appPackage, 0,

                UserHandle.getUserHandleForUid(userId));

                    UserHandle.of(userId));

            return appInfo.loadSafeLabel(pm);

        } catch (PackageManager.NameNotFoundException e) {

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

src/java/com/android/internal/telephony/ims/ImsResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -1542,7 +1542,7 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
        for (ResolveInfo entry : packageManager.queryIntentServicesAsUser(

                serviceIntent,

                PackageManager.GET_META_DATA,

                UserHandle.getUserHandleForUid(UserHandle.myUserId()))) {

                UserHandle.of(UserHandle.myUserId()))) {

            ServiceInfo serviceInfo = entry.serviceInfo;



            if (serviceInfo != null) {