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

Merge "Verfiy global apps with device owner" into mnc-dev

Browse Source
This commit is contained in:
Todd Kennedy
2015-07-16 17:59:32 +00:00
committed by Android (Google) Code Review
parent 1181323230 633f199831
commit a4911ed971
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -10620,6 +10620,12 @@ public class PackageManagerService extends IPackageManager.Stub {
final List<ComponentName> sufficientVerifiers = matchVerifiers(pkgLite, final List<ComponentName> sufficientVerifiers = matchVerifiers(pkgLite,
receivers, verificationState); receivers, verificationState);
// Apps installed for "all" users use the device owner to verify the app
UserHandle verifierUser = getUser();
if (verifierUser == UserHandle.ALL) {
verifierUser = UserHandle.OWNER;
}
/* /*
* If any sufficient verifiers were listed in the package * If any sufficient verifiers were listed in the package
* manifest, attempt to ask them. * manifest, attempt to ask them.
@@ -10635,8 +10641,7 @@ public class PackageManagerService extends IPackageManager.Stub {
final Intent sufficientIntent = new Intent(verification); final Intent sufficientIntent = new Intent(verification);
sufficientIntent.setComponent(verifierComponent); sufficientIntent.setComponent(verifierComponent);
mContext.sendBroadcastAsUser(sufficientIntent, verifierUser);
mContext.sendBroadcastAsUser(sufficientIntent, getUser());
} }
} }
} }
@@ -10651,7 +10656,7 @@ public class PackageManagerService extends IPackageManager.Stub {
* target BroadcastReceivers have run. * target BroadcastReceivers have run.
*/ */
verification.setComponent(requiredVerifierComponent); verification.setComponent(requiredVerifierComponent);
mContext.sendOrderedBroadcastAsUser(verification, getUser(), mContext.sendOrderedBroadcastAsUser(verification, verifierUser,
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT, android.Manifest.permission.PACKAGE_VERIFICATION_AGENT,
new BroadcastReceiver() { new BroadcastReceiver() {
@Override @Override