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

Commit 84e8e76e authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "use packageManager @SystemAPI"

parents c7850abb 4b5f423c

telephony/java/com/android/internal/telephony/SmsApplication.java

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public final class SmsApplication { 
                ApplicationInfo appInfo;

                try {

                    appInfo = pm.getApplicationInfoAsUser(mPackageName, 0,

                            UserHandle.getUserId(mUid));

                            UserHandle.getUserHandleForUid(mUid));

                } catch (NameNotFoundException e) {

                    return null;

                }
@@ -300,7 +300,7 @@ public final class SmsApplication { 
                Uri.fromParts(SCHEME_SMSTO, "", null));

        List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent,

                PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,

                userId);

                UserHandle.getUserHandleForUid(userId));

        for (ResolveInfo resolveInfo : respondServices) {

            final ServiceInfo serviceInfo = resolveInfo.serviceInfo;

            if (serviceInfo == null) {

telephony/java/com/android/internal/telephony/TelephonyPermissions.java

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public final class TelephonyPermissions { 
        ApplicationInfo callingPackageInfo = null;

        try {

            callingPackageInfo = context.getPackageManager().getApplicationInfoAsUser(

                    callingPackage, 0, UserHandle.getUserId(uid));

                    callingPackage, 0, UserHandle.getUserHandleForUid(uid));

            if (callingPackageInfo != null) {

                if (callingPackageInfo.isSystemApp()) {

                    isPreinstalled = true;