Merge "Use the installer package name for broadcasts" into oc-mr1-dev (4c7117af) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1930,8 +1930,12 @@ public class PackageManagerService extends IPackageManager.Stub

	final boolean update = res.removedInfo != null		final boolean update = res.removedInfo != null
	&& res.removedInfo.removedPackage != null;		&& res.removedInfo.removedPackage != null;
	final String origInstallerPackageName = res.removedInfo != null		final String installerPackageName =
	? res.removedInfo.installerPackageName : null;		res.installerPackageName != null
			? res.installerPackageName
			: res.removedInfo != null
			? res.removedInfo.installerPackageName
			: null;

	// If this is the first time we have child packages for a disabled privileged		// If this is the first time we have child packages for a disabled privileged
	// app that had no children, we grant requested runtime permissions to the new		// app that had no children, we grant requested runtime permissions to the new
	@@ -1996,10 +2000,10 @@ public class PackageManagerService extends IPackageManager.Stub
	sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,		sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
	extras, 0 /flags/,		extras, 0 /flags/,
	null /targetPackage/, null /finishedReceiver/, updateUsers);		null /targetPackage/, null /finishedReceiver/, updateUsers);
	if (origInstallerPackageName != null) {		if (installerPackageName != null) {
	sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,		sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
	extras, 0 /flags/,		extras, 0 /flags/,
	origInstallerPackageName, null /finishedReceiver/, updateUsers);		installerPackageName, null /finishedReceiver/, updateUsers);
	}		}

	// Send replaced for users that don't see the package for the first time		// Send replaced for users that don't see the package for the first time
	@@ -2008,10 +2012,10 @@ public class PackageManagerService extends IPackageManager.Stub
	packageName, extras, 0 /flags/,		packageName, extras, 0 /flags/,
	null /targetPackage/, null /finishedReceiver/,		null /targetPackage/, null /finishedReceiver/,
	updateUsers);		updateUsers);
	if (origInstallerPackageName != null) {		if (installerPackageName != null) {
	sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,		sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,
	extras, 0 /flags/,		extras, 0 /flags/,
	origInstallerPackageName, null /finishedReceiver/, updateUsers);		installerPackageName, null /finishedReceiver/, updateUsers);
	}		}
	sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED,		sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED,
	null /package/, null /extras/, 0 /flags/,		null /package/, null /extras/, 0 /flags/,
	@@ -17406,6 +17410,7 @@ public class PackageManagerService extends IPackageManager.Stub
	PackageParser.Package pkg;		PackageParser.Package pkg;
	int returnCode;		int returnCode;
	String returnMsg;		String returnMsg;
			String installerPackageName;
	PackageRemovedInfo removedInfo;		PackageRemovedInfo removedInfo;
	ArrayMap<String, PackageInstalledInfo> addedChildPackages;		ArrayMap<String, PackageInstalledInfo> addedChildPackages;

	@@ -18326,6 +18331,7 @@ public class PackageManagerService extends IPackageManager.Stub

	// Result object to be returned		// Result object to be returned
	res.setReturnCode(PackageManager.INSTALL_SUCCEEDED);		res.setReturnCode(PackageManager.INSTALL_SUCCEEDED);
			res.installerPackageName = installerPackageName;

	if (DEBUG_INSTALL) Slog.d(TAG, "installPackageLI: path=" + tmpPackageFile);		if (DEBUG_INSTALL) Slog.d(TAG, "installPackageLI: path=" + tmpPackageFile);