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

Merge "Fix permission check for system service" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-19 05:22:02 +00:00
committed by Android (Google) Code Review
parent 23b46af335 f773872a10
commit 04463d6730
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/credentials/CredentialProviderInfoFactory.java
View File

@@ -165,8 +165,7 @@ public final class CredentialProviderInfoFactory {
Slog.w(TAG, "Context is null in isSystemProviderWithValidPermission");
return false;
}
return PermissionUtils.isSystemApp(context, serviceInfo.packageName)
&& PermissionUtils.hasPermission(context, serviceInfo.packageName,
return PermissionUtils.hasPermission(context, serviceInfo.packageName,
Manifest.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE);
}

17
core/java/android/service/credentials/PermissionUtils.java
View File

@@ -17,7 +17,6 @@
package android.service.credentials;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
/**
@@ -33,21 +32,5 @@ public class PermissionUtils {
return context.getPackageManager().checkPermission(permission, packageName)
== PackageManager.PERMISSION_GRANTED;
}
/** Checks whether the given package name is a system app on the device **/
public static boolean isSystemApp(Context context, String packageName) {
try {
ApplicationInfo appInfo =
context.getPackageManager()
.getApplicationInfo(packageName,
PackageManager.ApplicationInfoFlags.of(
PackageManager.MATCH_SYSTEM_ONLY));
if (appInfo != null) {
return true;
}
} catch (PackageManager.NameNotFoundException e) {
}
return false;
}
}