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

Merge "Disallow disabling of the package installer" into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-03-16 23:32:25 +00:00
committed by Android (Google) Code Review
parent 276b1bc2ba 81fb0d4acd
commit 3084bb8719
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -151,10 +151,17 @@ public class Utils {
if (sSystemSignature == null) { if (sSystemSignature == null) {
sSystemSignature = new Signature[]{ getSystemSignature(pm) }; sSystemSignature = new Signature[]{ getSystemSignature(pm) };
} }
return sSystemSignature[0] != null && sSystemSignature[0].equals(getFirstSignature(pkg)); if (sPermissionControllerPackageName == null) {
sPermissionControllerPackageName = pm.getPermissionControllerPackageName();
}
return (sSystemSignature[0] != null
&& sSystemSignature[0].equals(getFirstSignature(pkg)))
|| (sPermissionControllerPackageName != null
&& sPermissionControllerPackageName.equals(pkg.packageName));
} }
private static Signature[] sSystemSignature; private static Signature[] sSystemSignature;
private static String sPermissionControllerPackageName;
private static Signature getFirstSignature(PackageInfo pkg) { private static Signature getFirstSignature(PackageInfo pkg) {
if (pkg != null && pkg.signatures != null && pkg.signatures.length > 0) { if (pkg != null && pkg.signatures != null && pkg.signatures.length > 0) {