Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use packageManager @SystemAPI"

Browse Source
This commit is contained in:
Chen Xu
2019-09-26 03:43:44 +00:00
committed by Gerrit Code Review
parent 8338b11afa 6a2926cd44
commit e958bbd8ae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/SmsApplication.java
View File

@@ -158,7 +158,7 @@ public final class SmsApplication {
ApplicationInfo appInfo; ApplicationInfo appInfo;
try { try {
appInfo = pm.getApplicationInfoAsUser(mPackageName, 0, appInfo = pm.getApplicationInfoAsUser(mPackageName, 0,
UserHandle.getUserId(mUid)); UserHandle.getUserHandleForUid(mUid));
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
return null; return null;
} }
@@ -300,7 +300,7 @@ public final class SmsApplication {
Uri.fromParts(SCHEME_SMSTO, "", null)); Uri.fromParts(SCHEME_SMSTO, "", null));
List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent, List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent,
PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId); UserHandle.getUserHandleForUid(userId));
for (ResolveInfo resolveInfo : respondServices) { for (ResolveInfo resolveInfo : respondServices) {
final ServiceInfo serviceInfo = resolveInfo.serviceInfo; final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
if (serviceInfo == null) { if (serviceInfo == null) {

2
telephony/java/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -367,7 +367,7 @@ public final class TelephonyPermissions {
ApplicationInfo callingPackageInfo = null; ApplicationInfo callingPackageInfo = null;
try { try {
callingPackageInfo = context.getPackageManager().getApplicationInfoAsUser( callingPackageInfo = context.getPackageManager().getApplicationInfoAsUser(
callingPackage, 0, UserHandle.getUserId(uid)); callingPackage, 0, UserHandle.getUserHandleForUid(uid));
if (callingPackageInfo != null) { if (callingPackageInfo != null) {
if (callingPackageInfo.isSystemApp()) { if (callingPackageInfo.isSystemApp()) {
isPreinstalled = true; isPreinstalled = true;