summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorPaul Milovanov <pmilovanov@google.com>2011-03-17 10:23:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-17 10:23:48 -0700
commit87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee (patch)
tree6aa498a88737a590d859aa362d9ef5a6037fc584 /services
parent11473332b4df78610ebb903e255d69ab35e5bf59 (diff)
parenta57db345d3f7b70854fd66e28b8b48d3fb27c606 (diff)
downloadframeworks_base-87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee.zip
frameworks_base-87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee.tar.gz
frameworks_base-87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee.tar.bz2
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 04f271d..d542673 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -7030,8 +7030,8 @@ class PackageManagerService extends IPackageManager.Stub {
if (pkgSetting.notLaunched) {
if (pkgSetting.installerPackageName != null) {
sendPackageBroadcast(Intent.ACTION_PACKAGE_FIRST_LAUNCH,
- pkgSetting.installerPackageName, null,
- pkgSetting.name, null);
+ pkgSetting.name, null,
+ pkgSetting.installerPackageName, null);
}
pkgSetting.notLaunched = false;
}